Change in vdsm[master]: migration: de-entangle migration stat reporting
Francesco Romani has abandoned this change. Change subject: migration: de-entangle migration stat reporting .. Abandoned obsoleted by topic:migration_report -- To view, visit https://gerrit.ovirt.org/42796 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: I6d745bacddf80c54354a2f7ec2d290dfd3b12d03 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: migration: de-entangle migration stat reporting
gerrit-hooks has posted comments on this change. Change subject: migration: de-entangle migration stat reporting .. Patch Set 7: * Update tracker: IGNORE, no Bug-Url found -- To view, visit https://gerrit.ovirt.org/42796 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6d745bacddf80c54354a2f7ec2d290dfd3b12d03 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: migration: de-entangle migration stat reporting
automat...@ovirt.org has posted comments on this change. Change subject: migration: de-entangle migration stat reporting .. Patch Set 7: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42796 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6d745bacddf80c54354a2f7ec2d290dfd3b12d03 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: migration: de-entangle migration stat reporting
automat...@ovirt.org has posted comments on this change. Change subject: migration: de-entangle migration stat reporting .. Patch Set 6: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42796 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6d745bacddf80c54354a2f7ec2d290dfd3b12d03 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: migration: de-entangle migration stat reporting
automat...@ovirt.org has posted comments on this change. Change subject: migration: de-entangle migration stat reporting .. Patch Set 5: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42796 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6d745bacddf80c54354a2f7ec2d290dfd3b12d03 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: migration: de-entangle migration stat reporting
automat...@ovirt.org has posted comments on this change. Change subject: migration: de-entangle migration stat reporting .. Patch Set 4: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42796 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6d745bacddf80c54354a2f7ec2d290dfd3b12d03 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: migration: de-entangle migration stat reporting
automat...@ovirt.org has posted comments on this change. Change subject: migration: de-entangle migration stat reporting .. Patch Set 3: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42796 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6d745bacddf80c54354a2f7ec2d290dfd3b12d03 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: migration: de-entangle migration stat reporting
automat...@ovirt.org has posted comments on this change. Change subject: migration: de-entangle migration stat reporting .. Patch Set 2: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42796 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6d745bacddf80c54354a2f7ec2d290dfd3b12d03 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: migration: de-entangle migration stat reporting
Francesco Romani has uploaded a new change for review. Change subject: migration: de-entangle migration stat reporting .. migration: de-entangle migration stat reporting migration.SourceThread has very entangled and messy status reporting. One single field is in charge to track migration status, including progress, errors and so forth. This leads to code hard to follow and to change. As first step to clean up the mess, we split the migration status tracking (e.g. progress while running, stats when done) from last error tracking. Change-Id: I6d745bacddf80c54354a2f7ec2d290dfd3b12d03 Signed-off-by: Francesco Romani from...@redhat.com --- M vdsm/virt/migration.py 1 file changed, 14 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/42796/1 diff --git a/vdsm/virt/migration.py b/vdsm/virt/migration.py index 99af017..415cdc1 100644 --- a/vdsm/virt/migration.py +++ b/vdsm/virt/migration.py @@ -89,6 +89,7 @@ config.get('vars', 'migration_downtime') self._autoConverge = autoConverge self._compressed = compressed +self._last_error = None self._last_status = { 'status': { 'code': 0, @@ -107,16 +108,23 @@ Get the status of the migration. + +if self._last_error is None: +res = utils.picklecopy(self._last_status) +else: +res = utils.picklecopy(self._last_error) + if self._monitorThread is not None: # fetch migration status from the monitor thread self._progress = self._monitorThread.progress -self._last_status['progress'] = self._progress + +res['progress'] = self._progress stat = self._vm._dom.jobStats(libvirt.VIR_DOMAIN_JOB_STATS_COMPLETED) if 'downtime_net' in stat: -self._last_status['downtime'] = stat['downtime_net'] +res['downtime'] = stat['downtime_net'] -return self._last_status +return res def _createClient(self, port): sslctx = sslutils.create_ssl_context() @@ -197,8 +205,7 @@ self._vm.lastStatus = vmstatus.MIGRATION_SOURCE def _recover(self, message): -if not response.is_failure(self._last_status): -self._last_status = response.error('migrateErr') +self._last_error = response.error('migrateErr') self.log.error(message) if not self.hibernating: try: @@ -288,7 +295,7 @@ self._finishSuccessfully() except libvirt.libvirtError as e: if e.get_error_code() == libvirt.VIR_ERR_OPERATION_ABORTED: -self._last_status = response.error( +self._last_error = response.error( 'migCancelErr', message='Migration canceled') raise @@ -326,7 +333,7 @@ destCreationTime) if response.is_failure(result): -self._last_status = result +self._last_error = result raise RuntimeError('migration destination error: ' + result['status']['message']) if config.getboolean('vars', 'ssl'): -- To view, visit https://gerrit.ovirt.org/42796 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6d745bacddf80c54354a2f7ec2d290dfd3b12d03 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: migration: de-entangle migration stat reporting
automat...@ovirt.org has posted comments on this change. Change subject: migration: de-entangle migration stat reporting .. Patch Set 1: * Update tracker::IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/42796 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I6d745bacddf80c54354a2f7ec2d290dfd3b12d03 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani from...@redhat.com Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches