Federico Simoncelli has uploaded a new change for review.

Change subject: core: check storage domains status on master deactivation
......................................................................

core: check storage domains status on master deactivation

When deactivating the master storage domain we should make sure that the
other domains are not in transition.

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1128824
Change-Id: I28228f2ad3ce555aafc9ea03d44aebeb12bbf0cf
Signed-off-by: Federico Simoncelli <fsimo...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
1 file changed, 8 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/17/32517/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
index 343a181..60438a5 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/storage/DeactivateStorageDomainCommand.java
@@ -132,7 +132,14 @@
                 return 
failCanDoAction(VdcBllMessages.ERROR_CANNOT_DEACTIVATE_MASTER_WITH_NON_DATA_DOMAINS);
             }
 
-            if (!filterDomainsByStatus(domains, 
StorageDomainStatus.Locked).isEmpty()) {
+            List<StorageDomain> busyDomains = LinqUtils.filter(domains, new 
Predicate<StorageDomain>() {
+                @Override
+                public boolean eval(StorageDomain storageDomain) {
+                    return 
storageDomain.getStatus().isStorageDomainInProcess();
+                }
+            });
+
+            if (!busyDomains.isEmpty()) {
                 return 
failCanDoAction(VdcBllMessages.ERROR_CANNOT_DEACTIVATE_MASTER_WITH_LOCKED_DOMAINS);
             }
         }


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

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

Reply via email to