Adam Litke has posted comments on this change. Change subject: LiveMerge: Add merge verb and related machinery ......................................................................
Patch Set 5: (2 comments) http://gerrit.ovirt.org/#/c/26635/5/vdsm/virt/vm.py File vdsm/virt/vm.py: Line 5214: self.log.error("merge: Refusing to merge into a shared volume") Line 5215: return errCode['mergeErr'] Line 5216: Line 5217: ret = self.trackBlockJob(jobUUID, drive, baseVolUUID, topVolUUID, Line 5218: 'commit') > We need a specific exception here. Done Line 5219: if ret is False: Line 5220: self.log.error("Another block job is already active on this disk") Line 5221: return errCode['mergeErr'] Line 5222: self.log.debug("Starting merge with jobUUID='%s'", jobUUID) Line 5234: try: Line 5235: ret = self._dom.blockCommit(drive.path, base, top, bandwidth, Line 5236: flags) Line 5237: if ret != 0: Line 5238: raise RuntimeError("blockCommit operation failed rc:%i", ret) > Maybe a new specific exception here, too? This is just a way to direct a nonzero return code to the same block of code that handles a libvirt exception. Since it is only used within a 2 line span, I don't think it makes sense to add one. Line 5239: except (RuntimeError, libvirt.libvirtError): Line 5240: self.log.error("Live merge failed for '%s'", drive.path, Line 5241: exc_info=True) Line 5242: self.untrackBlockJob(jobUUID) -- To view, visit http://gerrit.ovirt.org/26635 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I077e1bdf0130ebdc218135ca717a6a810bbab12c Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <[email protected]> Gerrit-Reviewer: Adam Litke <[email protected]> Gerrit-Reviewer: Federico Simoncelli <[email protected]> Gerrit-Reviewer: Francesco Romani <[email protected]> Gerrit-Reviewer: Greg Padgett <[email protected]> Gerrit-Reviewer: [email protected] Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: Yes _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
