Roy Golan has uploaded a new change for review.
Change subject: core: Remove get image info call before images commands
......................................................................
core: Remove get image info call before images commands
BaseImageCommands calls for an image info updates its last modification
time on success and does nothing(!) on failure - the nothing is achieved
by updating the status in the DB and throwing an exception right
afterwards - which means a rollback to the update will be made.
Change-Id: I93e53f009030fe38d57274544146102010570814
Signed-off-by: Roy Golan <rgo...@redhat.com>
---
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/CreateCloneOfTemplateCommand.java
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.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/RestoreFromSnapshotCommand.java
5 files changed, 0 insertions(+), 53 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/94/13994/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 9fad159..4a58c33 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
@@ -151,48 +151,6 @@
_imageGroupId = value;
}
- @Override
- protected void executeCommand() {
- checkImageValidity();
- }
-
- /**
- * Check if image is valid snapshot of vm
- */
- protected void checkImageValidity() {
- try {
- DiskImage diskImage = getImage();
- Guid storagePoolId = diskImage.getStoragePoolId() != null ?
diskImage.getStoragePoolId().getValue()
- : Guid.Empty;
- Guid storageDomainId =
- getStorageDomainId() != null &&
!getStorageDomainId().getValue().equals(Guid.Empty)
- ? getStorageDomainId().getValue()
- : (diskImage.getStorageIds() != null &&
diskImage.getStorageIds().size() > 0
- ? diskImage.getStorageIds().get(0)
- : Guid.Empty);
- Guid imageGroupId = diskImage.getId() != null ?
diskImage.getId().getValue()
- : Guid.Empty;
-
- DiskImage image = (DiskImage) runVdsCommand(
- VDSCommandType.GetImageInfo,
- new GetImageInfoVDSCommandParameters(storagePoolId,
storageDomainId, imageGroupId,
- getImage().getImageId())).getReturnValue();
-
- if (image.getImageStatus() != ImageStatus.OK) {
- diskImage.setImageStatus(image.getImageStatus());
- getImageDao().update(diskImage.getImage());
- throw new
VdcBLLException(VdcBllErrors.IRS_IMAGE_STATUS_ILLEGAL);
- }
-
- diskImage.setLastModified(image.getLastModifiedDate());
- } catch (RuntimeException ex) {
- if (ex instanceof VdcBLLException) {
- throw ex;
- }
- throw new
VdcBLLException(VdcBllErrors.RESOURCE_MANAGER_VM_SNAPSHOT_MISSMATCH, ex);
- }
- }
-
/**
* Snapshot can be created only when there is no other images mapped to
same drive in vm.
*
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java
index 8713df9..9ba4f94 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateCloneOfTemplateCommand.java
@@ -43,13 +43,6 @@
}
@Override
- protected void checkImageValidity() {
- // don't do nothing, overriding base to avoid this check
- // fails when creating vm from template on domain that the template
- // doesn't exist on
- }
-
- @Override
protected VDSReturnValue performImageVdsmOperation() {
setDestinationImageId(Guid.NewGuid());
mNewCreatedDiskImage = cloneDiskImage(getDestinationImageId());
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
index 10c9837..6ac5dbd 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateImageTemplateCommand.java
@@ -32,7 +32,6 @@
@Override
protected void executeCommand() {
- super.executeCommand();
Guid storagePoolId = getDiskImage().getStoragePoolId() != null ?
getDiskImage().getStoragePoolId()
.getValue() : Guid.Empty;
Guid imageGroupId = getDiskImage().getId() != null ?
getDiskImage().getId()
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 c205b42..06fb0f8 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
@@ -45,7 +45,6 @@
@Override
protected void executeCommand() {
- super.executeCommand();
if (canCreateSnapshot()) {
VDSReturnValue vdsReturnValue = performImageVdsmOperation();
if (vdsReturnValue != null && vdsReturnValue.getSucceeded()) {
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java
index 798a32a..e003954 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RestoreFromSnapshotCommand.java
@@ -29,8 +29,6 @@
@Override
protected void executeCommand() {
-
- super.executeCommand();
if (removeImages()) {
if (getParameters().getSnapshot().getType() !=
SnapshotType.REGULAR) {
getImage().setActive(true);
--
To view, visit http://gerrit.ovirt.org/13994
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I93e53f009030fe38d57274544146102010570814
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Roy Golan <rgo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
