[NEW PATCH] BZ#736103 - Raise error when volumes acquision fails in image resource factory (via gerrit-bot)

New patch submitted by Saggi Mizrahi (smizrahi(a)redhat.com)

You can review this change at: http://gerrit.usersys.redhat.com/915

commit 3cbaa27f9c883ee6343291126a5ad3027edd4de6
Author: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Date:   Thu Sep 8 12:15:57 2011 +0300

    BZ#736103 - Raise error when volumes acquision fails in image resource factory
    
    I chose not to reraise but to do `if failed:` because `raise e` would
    have lost some of the exception information and I hate it when that
    happens
    
    Change-Id: I7f204831f0fd3875651f4718ec529cb8f0dcccaf

diff --git a/vdsm/storage/resourceFactories.py b/vdsm/storage/resourceFactories.py
index 152d00b..f71ecd9 100644
--- a/vdsm/storage/resourceFactories.py
+++ b/vdsm/storage/resourceFactories.py
@@ -145,7 +145,7 @@ class ImageResourceFactory(rm.SimpleResourceFactory):
         if dom.__class__.__name__ == "BlockStorageDomain":
             lvm.activateLVs(self.sdUUID, volUUIDChain)
 
-        e = None
+        failed = False
         # Acquire template locks:
         # - 'lockType' for template's image itself
         # - Always 'shared' lock for image based on template
@@ -167,13 +167,17 @@ class ImageResourceFactory(rm.SimpleResourceFactory):
                 volResourcesList.append(volRes)
         except (rm.RequestTimedOutError, se.ResourceAcqusitionFailed), e:
             log.debug("Cannot acquire volume resource (%s)", str(e))
+            failed = True
+            raise
         except Exception, e:
             log.debug("Cannot acquire volume resource", exc_info=True)
-
-        if e:
-            # Release already acquired template/volumes locks
-            for volRes in volResourcesList:
-                volRes.release()
+            failed = True
+            raise
+        finally:
+            if failed:
+                # Release already acquired template/volumes locks
+                for volRes in volResourcesList:
+                    volRes.release()
 
         return volResourcesList

Change in vdsm[master]: BZ#736103 - Raise error when volumes acquision fails in imag...

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: BZ#736103 - Raise error when volumes acquision fails in image resource
factory
......................................................................


Patch Set 1: Looks good to me, approved

--
To view, visit http://gerrit.usersys.redhat.com/915
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7f204831f0fd3875651f4718ec529cb8f0dcccaf
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;

Change in vdsm[master]: BZ#736103 - Raise error when volumes acquision fails in imag...

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: BZ#736103 - Raise error when volumes acquision fails in image resource
factory
......................................................................


BZ#736103 - Raise error when volumes acquision fails in image resource factory

I chose not to reraise but to do `if failed:` because `raise e` would
have lost some of the exception information and I hate it when that
happens

Change-Id: I7f204831f0fd3875651f4718ec529cb8f0dcccaf
---
M vdsm/storage/resourceFactories.py
1 file changed, 10 insertions(+), 6 deletions(-)

Approvals:
  Dan Kenigsberg: Looks good to me, approved
  Igor Lvovsky: Looks good to me, but someone else must approve
  David Naori: Verified


--
To view, visit http://gerrit.usersys.redhat.com/915
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I7f204831f0fd3875651f4718ec529cb8f0dcccaf
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Naori <dnaori(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;

Change in vdsm[master]: BZ#736103 - Raise error when volumes acquision fails in imag...

[David Naori]

David Naori has posted comments on this change.

Change subject: BZ#736103 - Raise error when volumes acquision fails in image resource
factory
......................................................................


Patch Set 1: Verified

--
To view, visit http://gerrit.usersys.redhat.com/915
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7f204831f0fd3875651f4718ec529cb8f0dcccaf
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com&gt;
Gerrit-Reviewer: David Naori <dnaori(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;

Change in vdsm[master]: BZ#736103 - Raise error when volumes acquision fails in imag...

[Igor Lvovsky]

Igor Lvovsky has posted comments on this change.

Change subject: BZ#736103 - Raise error when volumes acquision fails in image resource
factory
......................................................................


Patch Set 1: Looks good to me, but someone else must approve

--
To view, visit http://gerrit.usersys.redhat.com/915
To unsubscribe, visit http://gerrit.usersys.redhat.com/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: I7f204831f0fd3875651f4718ec529cb8f0dcccaf
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com&gt;
Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com&gt;