Tomas Jelinek has uploaded a new change for review. Change subject: core: reset migration progress on migration end ......................................................................
core: reset migration progress on migration end There where 3 problems: - if the migration finished normally it took some time until also the migration progress got nulled - if the qemu process died on source host the migration progress was never nulled - if the qemu process died on the destination host the migration progress was never nulled Change-Id: Ifeb3875da032622d53f3921b0186b08009e4a191 Bug-Url: https://bugzilla.redhat.com/1114997 Signed-off-by: Tomas Jelinek <tjeli...@redhat.com> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java 2 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/63/29763/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java index 2fa4eba..da36adf 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/ResourceManager.java @@ -323,6 +323,7 @@ vm.setVmIp(null); vm.setVmFQDN(null); vm.setCpuName(null); + vm.setMigrationProgressPercent(0); List<VmNetworkInterface> interfaces = vm.getInterfaces(); for (VmNetworkInterface ifc : interfaces) { NetworkStatistics statistics = ifc.getStatistics(); diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java index a5052b4..e819848 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java @@ -1933,6 +1933,8 @@ _vmsToRerun.add(runningVm.getId()); log.infoFormat("Adding VM {0} to re-run list", runningVm.getId()); vmToUpdate.setMigratingToVds(null); + vmToUpdate.setMigrationProgressPercent(0); + addVmStatisticsToList(vmToUpdate.getStatisticsData()); } } @@ -1996,6 +1998,8 @@ _vmDict.put(vmToUpdate.argvalue.getId(), vmToUpdate.argvalue); if (vmNewDynamicData.getStatus() == VMStatus.Up) { + vmToUpdate.argvalue.setMigrationProgressPercent(0); + addVmStatisticsToList(vmToUpdate.argvalue.getStatisticsData()); if (!_succededToRunVms.contains(vmToUpdate.argvalue.getId())) { _succededToRunVms.add(vmToUpdate.argvalue.getId()); } -- To view, visit http://gerrit.ovirt.org/29763 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifeb3875da032622d53f3921b0186b08009e4a191 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Tomas Jelinek <tjeli...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
