Francesco Romani has uploaded a new change for review.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
vm: graphdev: fix device hooks post migration
the _deviceXML attribute was not regenerated on destination VM after migrations.
Change-Id: I6643f81cc5cff1a282da607e7e5759a97b081c7a Signed-off-by: Francesco Romani fromani@redhat.com --- M vdsm/virt/vm.py 1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/33/27933/1
diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py index e977ff3..20936a7 100644 --- a/vdsm/virt/vm.py +++ b/vdsm/virt/vm.py @@ -5122,6 +5122,12 @@
if alias in aliasToDevice: aliasToDevice[alias]._deviceXML = deviceXML.toxml() + elif deviceXML.tagName == GRAPHICS_DEVICES: + # graphics device do not have aliases, must match by type + graphType = deviceXML.getAttribute('type') + for devObj in self._devices[GRAPHICS_DEVICES]: + if devObj.device == graphType: + devObj._deviceXML = deviceXML.toxml()
def waitForMigrationDestinationPrepare(self): """Wait until paths are prepared for migration destination"""
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 1:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9075/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9216/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8287/ : SUCCESS
Michal Skrivanek has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 1: Code-Review+1
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 2:
Build Successful
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9110/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9253/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8322/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 3:
Build Successful
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9135/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9278/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8347/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 4:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9145/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9288/ : FAILURE
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8357/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 5:
Build Successful
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9186/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9329/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8398/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 6:
Build Successful
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9269/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9412/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8481/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 7:
Build Successful
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/9574/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/8642/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/9428/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 8:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/9243/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/10027/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/851/ : There was an infra issue, please contact infra@ovirt.org
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit/10182/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_verify-error-codes_merged/5109/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/3266/ : SUCCESS
Francesco Romani has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 9: Verified+1
Verified by doing a migration and checking the _deviceXML field was updated after that.
Further details: added a temporary log and removed before the push of this patch.
Proof of the update:
Thread-69::ERROR::2014-07-17 11:39:50,227::vm::5219::vm.Vm::(_updateDevicesDomxmlCache) vmId=`56d1c657-dd76-4609-a207-c050699be5be`::Alias not found for device type graphics during migration at destination host Thread-70::DEBUG::2014-07-17 11:39:50,228::vm::3702::vm.Vm::(_waitForIncomingMigrationFinish) vmId=`56d1c657-dd76-4609-a207-c050699be5be`::Waiting 21600 seconds for end of migration Thread-69::DEBUG::2014-07-17 11:39:50,240::vm::5235::vm.Vm::(_updateDevicesDomxmlCache) vmId=`56d1c657-dd76-4609-a207-c050699be5be`::graphics device updated: <graphics autoport="yes" keymap="en-us" passwdValidTo="1970-01-01T00:00:01" port="5900" type="spice"> <listen address="192.168.1.48" network="vdsm-ovirtmgmt" type="network"/> </graphics>
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 9:
Build Successful
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/10277/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/11062/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/1301/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/11219/ : SUCCESS
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 10:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/10287/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/11072/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/1309/ : There was an infra issue, please contact infra@ovirt.org
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/11229/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 11:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/10296/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/11081/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/1317/ : There was an infra issue, please contact infra@ovirt.org
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/11238/ : FAILURE
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 12:
Build Successful
http://jenkins.ovirt.org/job/vdsm_master_virt_functional_tests_gerrit/1431/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit_tests_gerrit_el/10786/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_created/11728/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_pep8_gerrit/11571/ : SUCCESS
Dan Kenigsberg has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 12: Code-Review+1
Francesco Romani has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 12: Verified+1
verified on a patched VDSM on RHEL 6.5 with manual inspection
Dan Kenigsberg has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 12: Code-Review+2
Dan Kenigsberg has submitted this change and it was merged.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
vm: graphdev: fix device hooks post migration
the _deviceXML attribute was not regenerated on destination VM after migrations.
Change-Id: I6643f81cc5cff1a282da607e7e5759a97b081c7a Signed-off-by: Francesco Romani fromani@redhat.com Reviewed-on: http://gerrit.ovirt.org/27933 Reviewed-by: Dan Kenigsberg danken@redhat.com --- M vdsm/virt/vm.py 1 file changed, 13 insertions(+), 3 deletions(-)
Approvals: Dan Kenigsberg: Looks good to me, approved Francesco Romani: Verified
oVirt Jenkins CI Server has posted comments on this change.
Change subject: vm: graphdev: fix device hooks post migration ......................................................................
Patch Set 13:
Build Failed
http://jenkins.ovirt.org/job/vdsm_master_create-rpms_merged/1856/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_create-rpms_merged_test_debug/197/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_verify-error-codes_merged/5830/ : SUCCESS
http://jenkins.ovirt.org/job/vdsm_master_unit-tests_merged/3989/ : FAILURE
vdsm-patches@lists.fedorahosted.org