Change in vdsm[master]: Live Merge: Notice imageSyncVolumeChain errors

alitke at redhat.com alitke at redhat.com
Wed Aug 26 20:04:04 UTC 2015


Adam Litke has uploaded a new change for review.

Change subject: Live Merge: Notice imageSyncVolumeChain errors
......................................................................

Live Merge: Notice imageSyncVolumeChain errors

Currently we ignore errors from imageSyncVolumeChain when resolving a
completed live merge operation.  This could cause us to signal the
completion of a live merge operation to ovirt-engine without first
updating the storage metadata.  Instead, we should detect the error and
raise an exception so that the LiveMergeCleanupThread working on this
job will retry the operation later.

Change-Id: I5447d06b6aade97f71a3b7d6d7c73f9699c307d0
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1214342
Signed-off-by: Adam Litke <alitke at redhat.com>
---
M vdsm/virt/vm.py
1 file changed, 5 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/45387/1

diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 90e6652..8695fe7 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -4845,8 +4845,11 @@
         self.log.debug("vdsm chain: %s, libvirt chain: %s", curVols, volumes)
 
         # Ask the storage to sync metadata according to the new chain
-        self.cif.irs.imageSyncVolumeChain(drive.domainID, drive.imageID,
-                                          drive['volumeID'], volumes)
+        res = self.cif.irs.imageSyncVolumeChain(drive.domainID, drive.imageID,
+                                                drive['volumeID'], volumes)
+        if res['status']['code'] != 0:
+            self.log.error("Unable to synchronize volume chain to storage")
+            raise StorageUnavailableError()
 
         if (set(curVols) == set(volumes)):
             return


-- 
To view, visit https://gerrit.ovirt.org/45387
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I5447d06b6aade97f71a3b7d6d7c73f9699c307d0
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <alitke at redhat.com>


More information about the vdsm-patches mailing list