Change in vdsm[master]: sp: improve pool creation error handling

[Federico Simoncelli]

Federico Simoncelli has uploaded a new change for review.

Change subject: sp: improve pool creation error handling
......................................................................

sp: improve pool creation error handling

Change-Id: I0cce08e368dec092222c081609d0663d7990ab10
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com&gt;
---
M vdsm/storage/sp.py
1 file changed, 17 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/18/22818/1

diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py
index 4f4765e..247973c 100644
--- a/vdsm/storage/sp.py
+++ b/vdsm/storage/sp.py
@@ -620,27 +620,30 @@
             # lock
             # TBD: create will receive only master domain and further attaches
             #      should be done under SPM
-
-            # Master domain was already attached (in createMaster),
-            # no need to reattach
-            for sdUUID in domList:
-                # No need to attach the master
-                if sdUUID != msdUUID:
-                    self.attachSD(sdUUID)
+            try:
+                for sdUUID in domList:
+                    # Master domain was already attached (in createMaster)
+                    if sdUUID != msdUUID:
+                        self.attachSD(sdUUID)
+            except Exception:
+                # FIXME: detachSD will fail for the master domain, we need a
+                # special handling (master must be detached from the pool).
+                self.__cleanupDomains(domList, msdUUID, masterVersion)
         except Exception:
-            self.log.error("Create pool %s canceled ", poolName,
exc_info=True)
+            self.log.exception('create pool %s canceled', self.spUUID)
             try:
                 fileUtils.cleanupdir(self.poolPath)
-                self.__cleanupDomains(domList, msdUUID, masterVersion)
-            except:
-                self.log.error("Cleanup failed due to an unexpected error",
-                               exc_info=True)
+            except Exception:
+                self.log.exception('pool %s cleanup failed', self.spUUID)
             raise
         finally:
             self._setUnsafe()
-
             self._releaseTemporaryClusterLock(msdUUID)
-            self.stopMonitoringDomains()
+            # stopMonitoringDomains needs masterDomain and the monitoring
+            # domains threads are started only if the master was properly
+            # initialized and set
+            if self.masterDomain:
+                self.stopMonitoringDomains()
 
         return True
 


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0cce08e368dec092222c081609d0663d7990ab10
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com&gt;