Adam Litke has uploaded a new change for review.
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(a)redhat.com>
---
M vdsm/virt/vm.py
1 file changed, 2 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/58/29358/1
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 543b798..8813d94 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -2351,6 +2351,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/29358
To unsubscribe, visit
http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6175530fe0aed1e00ad02b6a4abe0704c294e45b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <alitke(a)redhat.com>