Maor Lipchuk has uploaded a new change for review. Change subject: core: Refactor addDiskImageToDb to use active flag ......................................................................
core: Refactor addDiskImageToDb to use active flag Refactor the existing method addDiskImageToDb to use the active flag as an argument in the method API, since with Cinder the volume for a snapshot might not be always true. Change-Id: Ie77b70d83c7436533c7e62ea56fe52eaa67d2366 Bug-Url: https://bugzilla.redhat.com/1185826 Signed-off-by: Maor Lipchuk <mlipc...@redhat.com> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterDiskCommand.java 4 files changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/18/41818/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java index 7d5f33a..d8d1ded 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddImageFromScratchCommand.java @@ -66,9 +66,9 @@ @Override public Void runInTransaction() { if (!getParameters().isShouldRemainIllegalOnFailedExecution()) { - addDiskImageToDb(newDiskImage, getCompensationContext()); + addDiskImageToDb(newDiskImage, getCompensationContext(), Boolean.TRUE); } else { - addDiskImageToDb(newDiskImage, null); + addDiskImageToDb(newDiskImage, null, Boolean.TRUE); getCompensationContext().snapshotEntityStatus(newDiskImage.getImage(), ImageStatus.ILLEGAL); } return null; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java index 53ee6b8..e04372d 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/BaseImagesCommand.java @@ -243,8 +243,8 @@ } } - protected void addDiskImageToDb(DiskImage image, CompensationContext compensationContext) { - image.setActive(true); + protected void addDiskImageToDb(DiskImage image, CompensationContext compensationContext, boolean active) { + image.setActive(active); getImageDao().save(image.getImage()); DiskImageDynamic diskDynamic = new DiskImageDynamic(); diskDynamic.setId(image.getImageId()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java index 381f4cb..e5f2547 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateSnapshotCommand.java @@ -49,7 +49,7 @@ @Override public Void runInTransaction() { processOldImageFromDb(); - addDiskImageToDb(newDiskImage, getCompensationContext()); + addDiskImageToDb(newDiskImage, getCompensationContext(), Boolean.TRUE); setActionReturnValue(newDiskImage); setSucceeded(true); return null; diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterDiskCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterDiskCommand.java index 12e16f2..47f95a8 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterDiskCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RegisterDiskCommand.java @@ -85,7 +85,7 @@ ArrayList<Guid> storageIds = new ArrayList<>(); storageIds.add(getParameters().getStorageDomainId()); newDiskImage.setStorageIds(storageIds); - addDiskImageToDb(newDiskImage, getCompensationContext()); + addDiskImageToDb(newDiskImage, getCompensationContext(), Boolean.TRUE); getReturnValue().setActionReturnValue(newDiskImage.getId()); getReturnValue().setSucceeded(true); } else if (getParameters().getDiskImage().getDiskStorageType() == DiskStorageType.CINDER) { -- To view, visit https://gerrit.ovirt.org/41818 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie77b70d83c7436533c7e62ea56fe52eaa67d2366 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <mlipc...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
