[NEW PATCH] BZ#713823 - We should not fail if deactivateLV failed during block volume creation (via gerrit-bot)

[Igor Lvovsky]

New patch submitted by Igor Lvovsky (ilvovsky(a)redhat.com)

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

commit 2645f4da93635cbdac74c671ca87cd7e5b8d54da
Author: Igor Lvovsky <ilvovsky(a)redhat.com&gt;
Date:   Tue Jun 28 11:11:17 2011 +0300

    BZ#713823 - We should not fail if deactivateLV failed during block volume creation
    
    Change-Id: I096a82449d5f48800ac7ba2fa73ea51119acbcd1

diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py
index 7398a61..d82b905 100644
--- a/vdsm/storage/blockVolume.py
+++ b/vdsm/storage/blockVolume.py
@@ -158,7 +158,7 @@ class BlockVolume(volume.Volume):
 
                 # override size param by parent's size
                 size = pvol.getSize()
-        except se.StorageException, e:
+        except se.StorageException:
             cls.log.error("Unexpected error", exc_info=True)
             raise
         except Exception, e:
@@ -178,7 +178,7 @@ class BlockVolume(volume.Volume):
             if os.path.exists(vol_path):
                 os.unlink(vol_path)
             os.symlink(lvm.lvPath(sdUUID, volUUID), vol_path)
-        except se.StorageException, e:
+        except se.StorageException:
             cls.log.error("Unexpected error", exc_info=True)
             raise
         except Exception, e:
@@ -199,7 +199,7 @@ class BlockVolume(volume.Volume):
                 ## Create hardlink to template and its meta file
                 cls.log.info("Request to create snapshot %s/%s of volume
%s/%s", imgUUID, volUUID, srcImgUUID, srcVolUUID)
                 pvol.clone(imageDir, volUUID, volFormat, preallocate)
-        except Exception, e:
+        except Exception:
             cls.log.error("Unexpected error", exc_info=True)
             raise
 
@@ -212,7 +212,12 @@ class BlockVolume(volume.Volume):
                                                 "%s%s" % (TAG_PREFIX_IMAGE,
imgUUID,)))
             finally:
                 cls._tagCreateLock.release()
-            lvm.deactivateLVs(sdUUID, volUUID)
+
+            try:
+                lvm.deactivateLVs(sdUUID, volUUID)
+            except Exception, e:
+                cls.log.warn("Cannot deactivate new created volume %s/%s %s",
sdUUID, volUUID, str(e))
+
             vars.task.pushRecovery(task.Recovery("create block volume metadata
rollback", "blockVolume", "BlockVolume",
"createVolumeMetadataRollback",
                                                  [sdUUID, str(offs)]))
             # Set metadata and mark volume as legal.
@@ -221,7 +226,7 @@ class BlockVolume(volume.Volume):
                             size, volume.type2name(volFormat),
                             volume.type2name(preallocate), voltype,
                             diskType, desc, volume.LEGAL_VOL)
-        except se.StorageException, e:
+        except se.StorageException:
             cls.log.error("Unexpected error", exc_info=True)
             raise
         except Exception, e:

[MERGED PATCH] BZ#713823 - We should not fail if deactivateLV failed during block volume creation (via gerrit-bot)

[Igor Lvovsky]

Patch merged into repository

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