[Engine-patches] Change in ovirt-engine[master]: core: TryBackToAllSnapshots- use filtered disks

[amureini]

Allon Mureinik has uploaded a new change for review.

Change subject: core: TryBackToAllSnapshots- use filtered disks
......................................................................

core: TryBackToAllSnapshots- use filtered disks

TryBackToAllSnapshotsOfVmCommand.canDoAction() filters only the relevant
disks to check, and then passes all the disks to ImagesHandler.

This patch cleans up the usage of the filtered disks so filtering isn't
done twice.

Change-Id: I18edb75723b7f6019864e0fcabde49bdb26b53f1
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java
1 file changed, 4 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/47/11447/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java
index 5808d75..4f0a23b 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/TryBackToAllSnapshotsOfVmCommand.java
@@ -201,9 +201,6 @@
     @Override
     protected boolean canDoAction() {
         updateVmDisksFromDb();
-        Collection<DiskImage> diskImages =
-                ImagesHandler.filterImageDisks(getVm().getDiskMap().values(), 
false, true);
-        DiskImage vmDisk = LinqUtils.first(diskImages);
 
         Snapshot snapshot = 
getSnapshotDao().get(getParameters().getDstSnapshotId());
         SnapshotsValidator snapshotsValidator = new SnapshotsValidator();
@@ -215,7 +212,9 @@
                         && 
validate(snapshotsValidator.snapshotExists(snapshot))
                         && 
validate(snapshotsValidator.snapshotNotBroken(snapshot));
 
-        if (vmDisk != null) {
+        Collection<DiskImage> diskImages =
+                ImagesHandler.filterImageDisks(getVm().getDiskMap().values(), 
false, true);
+        if (!diskImages.isEmpty()) {
             result =
                     result
                             && validate(new 
StoragePoolValidator(getStoragePool()).isUp())
@@ -229,7 +228,7 @@
                                     false,
                                     true,
                                     true,
-                                    getVm().getDiskMap().values());
+                                    diskImages);
         }
         if (result && LinqUtils.foreach(diskImages, new Function<DiskImage, 
Guid>() {
             @Override


--
To view, visit http://gerrit.ovirt.org/11447
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I18edb75723b7f6019864e0fcabde49bdb26b53f1
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <amure...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches