Change in vdsm[ovirt-3.5]: Live Merge: Explicitly save block job info

alitke at redhat.com alitke at redhat.com
Mon Aug 4 21:06:57 UTC 2014


Hello Federico Simoncelli, Dan Kenigsberg, Francesco Romani,

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

    http://gerrit.ovirt.org/31046

to review the following change.

Change subject: Live Merge: Explicitly save block job info
......................................................................

Live Merge: Explicitly save block job info

When we removed _blockJobs from the VM.status() it had the unfortunate
side effect of causing block job info to not be saved by VM.saveState().
Fix this by explicitly adding it to toSave.

Change-Id: I6175530fe0aed1e00ad02b6a4abe0704c294e45b
Signed-off-by: Adam Litke <alitke at redhat.com>
Reviewed-on: http://gerrit.ovirt.org/29358
Reviewed-by: Federico Simoncelli <fsimonce at redhat.com>
Reviewed-by: Francesco Romani <fromani at redhat.com>
Reviewed-by: Dan Kenigsberg <danken at redhat.com>
---
M vdsm/virt/vm.py
1 file changed, 2 insertions(+), 0 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/46/31046/1

diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 48f0a56..825a9b2 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -2384,6 +2384,8 @@
                     drive['truesize'] = str(d.truesize)
                     drive['apparentsize'] = str(d.apparentsize)
 
+        toSave['_blockJobs'] = deepcopy(self.conf.get('_blockJobs', {}))
+
         with tempfile.NamedTemporaryFile(dir=constants.P_VDSM_RUN,
                                          delete=False) as f:
             pickle.dump(toSave, f)


-- 
To view, visit http://gerrit.ovirt.org/31046
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I6175530fe0aed1e00ad02b6a4abe0704c294e45b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Adam Litke <alitke at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Federico Simoncelli <fsimonce at redhat.com>
Gerrit-Reviewer: Francesco Romani <fromani at redhat.com>


More information about the vdsm-patches mailing list