Change in vdsm[master]: migration: make status field private
Francesco Romani has abandoned this change. Change subject: migration: make status field private .. Abandoned too old -- To view, visit https://gerrit.ovirt.org/49522 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: Ic14e19f0576512dde081a2bb575915563843ee87 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Milan Zamazal 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: make status field private
gerrit-hooks has posted comments on this change. Change subject: migration: make status field private .. Patch Set 7: * Update tracker: IGNORE, no Bug-Url found -- To view, visit https://gerrit.ovirt.org/49522 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic14e19f0576512dde081a2bb575915563843ee87 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Milan Zamazal 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: make status field private
gerrit-hooks has posted comments on this change. Change subject: migration: make status field private .. 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.6', 'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/49522 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic14e19f0576512dde081a2bb575915563843ee87 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Milan Zamazal 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: make status field private
Milan Zamazal has posted comments on this change. Change subject: migration: make status field private .. Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.ovirt.org/49522 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic14e19f0576512dde081a2bb575915563843ee87 Gerrit-PatchSet: 6 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Milan Zamazal 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: make status field private
gerrit-hooks has posted comments on this change. Change subject: migration: make status field private .. 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.6', 'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/49522 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic14e19f0576512dde081a2bb575915563843ee87 Gerrit-PatchSet: 7 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Milan Zamazal 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: make status field private
gerrit-hooks has posted comments on this change. Change subject: migration: make status field private .. 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.6', 'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/49522 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic14e19f0576512dde081a2bb575915563843ee87 Gerrit-PatchSet: 5 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Milan Zamazal 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: make status field private
gerrit-hooks has posted comments on this change. Change subject: migration: make status field private .. 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.6', 'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/49522 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic14e19f0576512dde081a2bb575915563843ee87 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Milan Zamazal 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: make status field private
Milan Zamazal has posted comments on this change. Change subject: migration: make status field private .. Patch Set 2: Code-Review-1 (1 comment) https://gerrit.ovirt.org/#/c/49522/2/vdsm/virt/migration.py File vdsm/virt/migration.py: Line 296: self._finishSuccessfully() Line 297: except libvirt.libvirtError as e: Line 298: if e.get_error_code() == libvirt.VIR_ERR_OPERATION_ABORTED: Line 299: self._last_status = response.error('migCancelErr', Line 300: message='Migration canceled') PEP8 indentation problem here after renaming. Line 301: raise Line 302: finally: Line 303: if '_migrationParams' in self._vm.conf: Line 304: del self._vm.conf['_migrationParams'] -- To view, visit https://gerrit.ovirt.org/49522 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic14e19f0576512dde081a2bb575915563843ee87 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Milan Zamazal Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: migration: make status field private
gerrit-hooks has posted comments on this change. Change subject: migration: make status field private .. 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.6', 'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/49522 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic14e19f0576512dde081a2bb575915563843ee87 Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Francesco Romani Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Martin Polednik Gerrit-Reviewer: Milan Zamazal 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: make status field private
Francesco Romani has posted comments on this change. Change subject: migration: make status field private .. Patch Set 2: Verified+1 -- To view, visit https://gerrit.ovirt.org/49522 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic14e19f0576512dde081a2bb575915563843ee87 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Francesco Romani Gerrit-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: make status field private
Francesco Romani has posted comments on this change. Change subject: migration: make status field private .. Patch Set 1: verified succesfully migrating a VM over patched VDSM, and succesfully canceling migration. -- To view, visit https://gerrit.ovirt.org/49522 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic14e19f0576512dde081a2bb575915563843ee87 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Francesco Romani Gerrit-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: make status field private
gerrit-hooks has posted comments on this change. Change subject: migration: make status field private .. 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.6', 'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/49522 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic14e19f0576512dde081a2bb575915563843ee87 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: Francesco Romani Gerrit-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: make status field private
Francesco Romani has uploaded a new change for review. Change subject: migration: make status field private .. migration: make status field private There is no more reason to have this field public, so let's make it private. Change-Id: Ic14e19f0576512dde081a2bb575915563843ee87 Signed-off-by: Francesco Romani--- M vdsm/virt/migration.py 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/22/49522/1 diff --git a/vdsm/virt/migration.py b/vdsm/virt/migration.py index 43d9951..23f8e8a 100644 --- a/vdsm/virt/migration.py +++ b/vdsm/virt/migration.py @@ -95,7 +95,7 @@ config.get('vars', 'migration_downtime') self._autoConverge = autoConverge self._compressed = compressed -self.status = { +self._last_status = { 'status': { 'code': 0, 'message': 'Migration in progress'}} @@ -116,13 +116,13 @@ if self._monitorThread is not None: # fetch migration status from the monitor thread self._progress = self._monitorThread.progress -self.status['progress'] = self._progress +self._last_status['progress'] = self._progress stat = self._vm._dom.jobStats(libvirt.VIR_DOMAIN_JOB_STATS_COMPLETED) if 'downtime_net' in stat: -self.status['downtime'] = stat['downtime_net'] +self._last_status['downtime'] = stat['downtime_net'] -return self.status +return self._last_status def _createClient(self, port): sslctx = sslutils.create_ssl_context() @@ -203,8 +203,8 @@ self._vm.lastStatus = vmstatus.MIGRATION_SOURCE def _recover(self, message): -if not response.is_error(self.status): -self.status = response.error('migrateErr') +if not response.is_error(self._last_status): +self._last_status = response.error('migrateErr') self.log.error(message) if not self.hibernating: try: @@ -222,7 +222,7 @@ self._progress = 100 if not self.hibernating: self._vm.setDownStatus(NORMAL, vmexitreason.MIGRATION_SUCCEEDED) -self.status['status']['message'] = 'Migration done' +self._last_status['status']['message'] = 'Migration done' else: # don't pickle transient params for ignoreParam in ('displayIp', 'display', 'pid'): @@ -238,7 +238,7 @@ self._vm.cif.teardownVolumePath(self._dstparams) self._vm.setDownStatus(NORMAL, vmexitreason.SAVE_STATE_SUCCEEDED) -self.status['status']['message'] = 'SaveState done' +self._last_status['status']['message'] = 'SaveState done' def _patchConfigForLegacy(self): """ @@ -296,7 +296,7 @@ self._finishSuccessfully() except libvirt.libvirtError as e: if e.get_error_code() == libvirt.VIR_ERR_OPERATION_ABORTED: -self.status = response.error('migCancelErr', +self._last_status = response.error('migCancelErr', message='Migration canceled') raise finally: @@ -336,7 +336,7 @@ destCreationTime) if response.is_error(result): -self.status = result +self._last_status = result raise MigrationDestinationSetupError( 'migration destination error: ' + result['status']['message']) @@ -415,9 +415,9 @@ if not self._preparingMigrationEvt: raise else: -self.status['status']['message'] = \ +self._last_status['status']['message'] = \ 'Migration process cancelled' -return self.status +return self._last_status def exponential_downtime(downtime, steps): -- To view, visit https://gerrit.ovirt.org/49522 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic14e19f0576512dde081a2bb575915563843ee87 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco Romani 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: make status field private
gerrit-hooks has posted comments on this change. Change subject: migration: make status field private .. 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.6', 'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3']) -- To view, visit https://gerrit.ovirt.org/49522 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ic14e19f0576512dde081a2bb575915563843ee87 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Francesco RomaniGerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches