Allon Mureinik has uploaded a new change for review.

Change subject: core: RemoveVm CDA for LUN disks optimization
......................................................................

core: RemoveVm CDA for LUN disks optimization

Since now ImagesHandler.PerformImagesChecks no longer handles VM-level
validations, it's possible to skip it altogether if the VM has no image
disks (i.e., no disks at all, or just LUN disks) associated with it.

Note: This refactoring is a step in a long series of patches intended to
completely remove PerformImagesChecks.

Change-Id: Ief6ebb5d3d5b23075424acc92a616f2d7e338170
Signed-off-by: Allon Mureinik <[email protected]>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
1 file changed, 6 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/44/12144/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
index d7991ea..18029f5 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmCommand.java
@@ -1,6 +1,7 @@
 package org.ovirt.engine.core.bll;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -152,7 +153,9 @@
             return false;
         }
 
-        if (!ImagesHandler.PerformImagesChecks(
+        Collection<Disk> vmDisks = getVm().getDiskMap().values();
+        List<DiskImage> vmImages = ImagesHandler.filterImageDisks(vmDisks, 
true, false);
+        if (!vmImages.isEmpty() && !ImagesHandler.PerformImagesChecks(
                 getReturnValue().getCanDoActionMessages(),
                 getVm().getStoragePoolId(),
                 Guid.Empty,
@@ -160,9 +163,9 @@
                 !getParameters().getForce(),
                 false,
                 false,
-                !getVm().getDiskMap().values().isEmpty(),
                 true,
-                getVm().getDiskMap().values())) {
+                true,
+                vmImages)) {
             return false;
         }
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief6ebb5d3d5b23075424acc92a616f2d7e338170
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to