Change in vdsm[master]: shareVolumeRollback() unique call likes to raise on the unex...
ewarszaw at redhat.com
ewarszaw at redhat.com
Sun Jan 27 13:12:50 UTC 2013
Eduardo has uploaded a new change for review.
Change subject: shareVolumeRollback() unique call likes to raise on the unexpected.
......................................................................
shareVolumeRollback() unique call likes to raise on the unexpected.
Change-Id: I8f01ff2d30ffecc05b9cfd4978f79003a8032270
Signed-off-by: Eduardo <ewarszaw at redhat.com>
---
M vdsm/storage/blockVolume.py
M vdsm/storage/fileVolume.py
2 files changed, 5 insertions(+), 15 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/22/11422/1
diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py
index 5dec748..355e961 100644
--- a/vdsm/storage/blockVolume.py
+++ b/vdsm/storage/blockVolume.py
@@ -335,12 +335,7 @@
@classmethod
def shareVolumeRollback(cls, taskObj, volPath):
cls.log.info("Volume rollback for volPath=%s", volPath)
-
- try:
- fileUtils.safeUnlink(volPath)
-
- except Exception:
- cls.log.error("Unexpected error", exc_info=True)
+ fileUtils.safeUnlink(volPath)
@deprecated # valid only for domain version < 3, see volume.setrw
def _setrw(self, rw):
diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py
index d1c465b..e42fbad 100644
--- a/vdsm/storage/fileVolume.py
+++ b/vdsm/storage/fileVolume.py
@@ -260,15 +260,10 @@
@classmethod
def shareVolumeRollback(cls, taskObj, volPath):
cls.log.info("Volume rollback for volPath=%s", volPath)
-
- try:
- procPool = oop.getProcessPool(getDomUuidFromVolumePath(volPath))
- procPool.fileUtils.safeUnlink(volPath)
- procPool.fileUtils.safeUnlink(cls.__metaVolumePath(volPath))
- procPool.fileUtils.safeUnlink(cls.__leaseVolumePath(volPath))
-
- except Exception:
- cls.log.error("Unexpected error", exc_info=True)
+ procPool = oop.getProcessPool(getDomUuidFromVolumePath(volPath))
+ procPool.fileUtils.safeUnlink(volPath)
+ procPool.fileUtils.safeUnlink(cls.__metaVolumePath(volPath))
+ procPool.fileUtils.safeUnlink(cls.__leaseVolumePath(volPath))
@deprecated # valid only for domain version < 3, see volume.setrw
def _setrw(self, rw):
--
To view, visit http://gerrit.ovirt.org/11422
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f01ff2d30ffecc05b9cfd4978f79003a8032270
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw at redhat.com>
More information about the vdsm-patches
mailing list