Change in vdsm[master]: vdsm: migration status structure refactoring - vdsm-patches - Fedora mailing-lists

11 Feb 2013

Peter V. Saveliev has uploaded a new change for review.
Change subject: vdsm: migration status structure refactoring
......................................................................
vdsm: migration status structure refactoring
Signed-off-by: Peter V. Saveliev peet@redhat.com
Change-Id: Iffff72af06c0d6d91968a6aa27780e16e77213ef
---
M vdsm/vm.py
1 file changed, 10 insertions(+), 20 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/13/11913/1

diff --git a/vdsm/vm.py b/vdsm/vm.py
index 87eaa47..8b2bbb6 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -216,13 +216,10 @@
         self._vm.lastStatus = 'Up'
def _finishSuccessfully(self):
+        self.status['progress'] = 100
         if self._mode != 'file':
             self._vm.setDownStatus(NORMAL, "Migration succeeded")
-            self.status = {
-                'status': {
-                    'code': 0,
-                    'message': 'Migration done'},
-                'progress': 100}
+            self.status['status']['message'] = 'Migration done'
         else:
             # don't pickle transient params
             for ignoreParam in ('displayIp', 'display', 'pid'):
@@ -237,10 +234,7 @@
                 self._vm.cif.teardownVolumePath(self._dstparams)
self._vm.setDownStatus(NORMAL, "SaveState succeeded")
-            self.status = {'status': {
-                'code': 0,
-                'message': 'SaveState done'},
-                'progress': 100}
+            self.status['status']['message'] = 'SaveState done'
def _patchConfigForLegacy(self):
         """
@@ -279,10 +273,8 @@
                 self._finishSuccessfully()
             except libvirt.libvirtError as e:
                 if e.get_error_code() == libvirt.VIR_ERR_OPERATION_ABORTED:
-                    self.status = {
-                        'status': {
-                            'code': errCode['migCancelErr'],
-                            'message': 'Migration canceled'}}
+                    self.status['status']['code'] = errCode['migCancelErr']
+                    self.status['status']['message'] = 'Migration canceled'
                 raise
             finally:
                 if '_migrationParams' in self._vm.conf:
@@ -1200,11 +1192,8 @@
             self._migrationSourceThread = \
                 self.MigrationSourceThreadClass(self, **params)
             self._migrationSourceThread.start()
-            check = self._migrationSourceThread.getStat()
-            if check['status']['code']:
-                return check
-            return {'status': {'code': 0,
-                               'message': 'Migration process starting'}}
+            self._migrationSourceThread.getStat()
+            return self._migrationSourceThread.status
         finally:
             self._guestCpuLock.release()
@@ -1215,8 +1204,9 @@
         self._acquireCpuLockWithTimeout()
         try:
             self._migrationSourceThread.stop()
-            return {'status': {'code': 0,
-                               'message': 'Migration process stopped'}}
+            self._migrationSourceThread.status['status']['message'] = \
+                'Migration process cancelled'
+            return self._migrationSourceThread.status
         except libvirt.libvirtError as e:
             if e.get_error_code() == libvirt.VIR_ERR_OPERATION_INVALID:
                 return errCode['migCancelErr']
--
To view, visit http://gerrit.ovirt.org/11913
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iffff72af06c0d6d91968a6aa27780e16e77213ef
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Peter V. Saveliev peet@redhat.com

    