diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-03-16 21:54:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-03-16 21:54:58 +0000 |
| commit | 932c02059672caea2d5f54cc2af848b77d3ee672 (patch) | |
| tree | 5609c429b8d4cb3621616c8332ce3cb57a2e8d1d | |
| parent | 11bf4223fb7bf9cca2db1570b7b916396552202c (diff) | |
| parent | 11ca746c3cd69fe07bc2fc4a1d5d9bb2a27d73a5 (diff) | |
| download | trove-932c02059672caea2d5f54cc2af848b77d3ee672.tar.gz | |
Merge "Fix Timestamp diff in Instance and Notification"
| -rw-r--r-- | trove/taskmanager/models.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/trove/taskmanager/models.py b/trove/taskmanager/models.py index 7208c994..a3d8a3ca 100644 --- a/trove/taskmanager/models.py +++ b/trove/taskmanager/models.py @@ -1294,7 +1294,9 @@ class ResizeActionBase(ConfigurationMixin): self._assert_datastore_is_offline() self._perform_nova_action() finally: - self.instance.reset_task_status() + if self.instance.db_info.task_status != ( + inst_models.InstanceTasks.NONE): + self.instance.reset_task_status() def _guest_is_awake(self): self.instance._refresh_datastore_status() @@ -1409,7 +1411,8 @@ class ResizeAction(ResizeActionBase): def _record_action_success(self): LOG.debug(_("Updating instance %(id)s to flavor_id %(flavor_id)s.") % {'id': self.instance.id, 'flavor_id': self.new_flavor_id}) - self.instance.update_db(flavor_id=self.new_flavor_id) + self.instance.update_db(flavor_id=self.new_flavor_id, + task_status=inst_models.InstanceTasks.NONE) self.instance.send_usage_event( 'modify_flavor', old_instance_size=self.old_flavor['ram'], |