Change in vdsm[ovirt-3.4]: clientIF: Teardown volume path only for VDSM images

Hello Ayal Baron, Nir Soffer, Allon Mureinik,

I'd like you to do a code review.  Please visit

http://gerrit.ovirt.org/24467

to review the following change.

Change subject: clientIF: Teardown volume path only for VDSM images
......................................................................

clientIF: Teardown volume path only for VDSM images

Trying to tear down a cdrom or external lun throws an exception which
creates a lot of log printings.

Change-Id: I041a306636c75a7aa37d4d7c0811366d80fe609c
Bug-Url: https://bugzilla.redhat.com/980054
Signed-off-by: Sergey Gotliv 
Reviewed-on: http://gerrit.ovirt.org/21973
Reviewed-by: Nir Soffer 
Reviewed-by: Ayal Baron 
Reviewed-by: Allon Mureinik 
---
M vdsm/clientIF.py
1 file changed, 4 insertions(+), 3 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/24467/1

diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py
index 67dacab..1d3b0a4 100644
--- a/vdsm/clientIF.py
+++ b/vdsm/clientIF.py
@@ -323,9 +323,10 @@
     def teardownVolumePath(self, drive):
         res = {'status': doneCode}
         try:
-            res = self.irs.teardownImage(drive['domainID'],
-                                         drive['poolID'], drive['imageID'])
-        except (KeyError, TypeError):
+            if vm.isVdsmImage(drive):
+                res = self.irs.teardownImage(drive['domainID'],
+                                             drive['poolID'], drive['imageID'])
+        except TypeError:
             # paths (strings) are not deactivated
             if not isinstance(drive, basestring):
                 self.log.warning("Drive is not a vdsm image: %s",

[Nir Soffer]

Nir Soffer has posted comments on this change.

Change subject: clientIF: Teardown volume path only for VDSM images
......................................................................

Patch Set 1: Code-Review+1

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: clientIF: Teardown volume path only for VDSM images
......................................................................

Patch Set 1: Code-Review+2

Yaniv Bronhaim has posted comments on this change.

Change subject: clientIF: Teardown volume path only for VDSM images
......................................................................

Patch Set 1: Code-Review+2

verified?

Sergey Gotliv has posted comments on this change.

Change subject: clientIF: Teardown volume path only for VDSM images
......................................................................

Patch Set 1: Verified+1

Yaniv Bronhaim has submitted this change and it was merged.

Change subject: clientIF: Teardown volume path only for VDSM images
......................................................................

clientIF: Teardown volume path only for VDSM images

Trying to tear down a cdrom or external lun throws an exception which
creates a lot of log printings.

Change-Id: I041a306636c75a7aa37d4d7c0811366d80fe609c
Bug-Url: https://bugzilla.redhat.com/980054
Signed-off-by: Sergey Gotliv 
Reviewed-on: http://gerrit.ovirt.org/21973
Reviewed-by: Nir Soffer 
Reviewed-by: Ayal Baron 
Reviewed-by: Allon Mureinik 
Reviewed-on: http://gerrit.ovirt.org/24467
Reviewed-by: Dan Kenigsberg 
Reviewed-by: Yaniv Bronhaim 
---
M vdsm/clientIF.py
1 file changed, 4 insertions(+), 3 deletions(-)

Approvals:
  Nir Soffer: Looks good to me, but someone else must approve
  Yaniv Bronhaim: Looks good to me, approved
  Sergey Gotliv: Verified
  Dan Kenigsberg: Looks good to me, approved