Maor Lipchuk has uploaded a new change for review. Change subject: core: Remove redundant method in CreateSnapshotCommand. ......................................................................
core: Remove redundant method in CreateSnapshotCommand. The calidation for VM which is not during snapshot is being done already at CreateAllSnapshotsCommand, Change-Id: Ie0ae57eac69d502182fa40a2968926ba289f27ad Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Maor Lipchuk <[email protected]> --- 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 2 files changed, 12 insertions(+), 31 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/75/40975/1 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 44dc15d..53ee6b8 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 @@ -8,7 +8,6 @@ import org.apache.commons.lang.NotImplementedException; import org.ovirt.engine.core.bll.context.CommandContext; import org.ovirt.engine.core.bll.context.CompensationContext; -import org.ovirt.engine.core.bll.snapshots.SnapshotsValidator; import org.ovirt.engine.core.bll.storage.StorageDomainCommandBase; import org.ovirt.engine.core.common.action.ImagesActionsParametersBase; import org.ovirt.engine.core.common.action.ImagesContainterParametersBase; @@ -160,20 +159,6 @@ protected EngineLock getSnapshotsEngineLock() { return snapshotsEngineLock; - } - - /** - * Snapshot can be created only when there is no other images mapped to same drive in vm. - * - * @return true if snapshot can be created - */ - // TODO: Should be moved to another class in the hierarchy - protected boolean canCreateSnapshot() { - if (!new SnapshotsValidator().vmNotDuringSnapshot(getVmId()).isValid()) { - log.error("Cannot create snapshot. Vm is in preview status"); - return false; - } - return true; } /** 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 a2015cc..9d00d96 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 @@ -43,23 +43,19 @@ @Override protected void executeCommand() { - if (canCreateSnapshot()) { - VDSReturnValue vdsReturnValue = performImageVdsmOperation(); - if (vdsReturnValue != null && vdsReturnValue.getSucceeded()) { - TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { - @Override - public Void runInTransaction() { - processOldImageFromDb(); - addDiskImageToDb(newDiskImage, getCompensationContext()); - setActionReturnValue(newDiskImage); - setSucceeded(true); - return null; - } - }); - - } + VDSReturnValue vdsReturnValue = performImageVdsmOperation(); + if (vdsReturnValue != null && vdsReturnValue.getSucceeded()) { + TransactionSupport.executeInNewTransaction(new TransactionMethod<Void>() { + @Override + public Void runInTransaction() { + processOldImageFromDb(); + addDiskImageToDb(newDiskImage, getCompensationContext()); + setActionReturnValue(newDiskImage); + setSucceeded(true); + return null; + } + }); } - } protected Guid getDestinationStorageDomainId() { -- To view, visit https://gerrit.ovirt.org/40975 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0ae57eac69d502182fa40a2968926ba289f27ad Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Maor Lipchuk <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
