Change in vdsm[master]: vm: fix misleading log of Domain XML

fromani at redhat.com fromani at redhat.com
Fri Aug 14 10:47:28 UTC 2015


Francesco Romani has uploaded a new change for review.

Change subject: vm: fix misleading log of Domain XML
......................................................................

vm: fix misleading log of Domain XML

In all but the migration destination VM creation paths
we log the Domain XML VDSM constructed based on VM configuration
sent by client (aka Engine). This is very useful for debug,
but it is also severely misleading in the de-hibernation
(aka migration from file) path, because what libvirt will
use here is *not* the XML VDSM produced, but the one saved
when VM was hibernated.

This patch logs the right XML in the VM dehibernation path.

Change-Id: I50f5b8a51830c8ce2a098e4ac11dd1bd6a89aac3
X-Backport-To: 3.6
Bug-Url: https://bugzilla.redhat.com/??????
Signed-off-by: Francesco Romani <fromani at redhat.com>
---
M vdsm/virt/vm.py
1 file changed, 5 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/43/44843/1

diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index a4b6e88..9d77978 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -1873,7 +1873,7 @@
                                dev.device)
                 dev.detach()
 
-            if initDomain:
+            if not self._incomingMigrationPending():
                 domxml = hooks.before_vm_start(self._buildDomainXML(),
                                                self.conf)
                 # TODO: this is debug information. For 3.6.x we still need to
@@ -1895,6 +1895,10 @@
             hooks.before_vm_dehibernate(srcDomXML, self.conf,
                                         {'FROM_SNAPSHOT': str(fromSnapshot)})
 
+            # TODO: this is debug information. For 3.6.x we still need to
+            # see the XML even with 'info' as default level.
+            self.log.info(srcDomXML)
+
             fname = self.cif.prepareVolumePath(self.conf['restoreState'])
             try:
                 self._connection.restoreFlags(fname, srcDomXML, 0)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I50f5b8a51830c8ce2a098e4ac11dd1bd6a89aac3
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Francesco Romani <fromani at redhat.com>


More information about the vdsm-patches mailing list