Change in vdsm[master]: Stop spm if refresh fail on bad parameters.

ewarszaw at redhat.com ewarszaw at redhat.com
Mon Apr 15 13:10:10 UTC 2013


Eduardo has uploaded a new change for review.

Change subject: Stop spm if refresh fail on bad parameters.
......................................................................

Stop spm if refresh fail on bad parameters.

Change-Id: I0f85c3e731551b6974483cffe38c7ac37281370b
Signed-off-by: Eduardo <ewarszaw at redhat.com>
---
M vdsm/storage/hsm.py
1 file changed, 6 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/30/13930/1

diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index fd5d7d6..ba59348 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -788,12 +788,16 @@
             se.StoragePoolActionError(
                 "spUUID=%s, msdUUID=%s, masterVersion=%s" %
                 (spUUID, msdUUID, masterVersion)))
-        vars.task.getSharedLock(STORAGE, spUUID)
+        self.getPool(spUUID)  # Validate that is the correct pool.
+        vars.task.getExclusiveLock(STORAGE, spUUID)
         pool = self.getPool(spUUID)
         try:
             self.validateSdUUID(msdUUID)
             pool.refresh(msdUUID, masterVersion)
-        except:
+        except (se.StorageDomainAccessError, se.StorageDomainDoesNotExist,
+                se.StoragePoolWrongMaster):
+            self.log.error("refreshStoragePool failed", exc_info=True)
+            pool.stopSpm()
             self._disconnectPool(pool, pool.id, pool.scsiKey, False)
             raise
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f85c3e731551b6974483cffe38c7ac37281370b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw at redhat.com>


More information about the vdsm-patches mailing list