diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-04 19:43:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-04 19:43:39 +0000 |
| commit | a22096d7becdd3c5a03fcb8ce20fb296f8b303dd (patch) | |
| tree | 343b2df5b16e76d70fa81fec56ad812c077ab639 | |
| parent | 0388379e8c899084468abe093c022ce69f52f8fb (diff) | |
| parent | df7aca88693e6435bbfc12ad06aa9d5d62399c69 (diff) | |
| download | nova-a22096d7becdd3c5a03fcb8ce20fb296f8b303dd.tar.gz nova-a22096d7becdd3c5a03fcb8ce20fb296f8b303dd.tar.xz nova-a22096d7becdd3c5a03fcb8ce20fb296f8b303dd.zip | |
Merge "Use conductor for resourcetracker instance_update."
| -rw-r--r-- | nova/compute/resource_tracker.py | 7 | ||||
| -rw-r--r-- | nova/conductor/manager.py | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py index 07e839857..0767b4e61 100644 --- a/nova/compute/resource_tracker.py +++ b/nova/compute/resource_tracker.py @@ -23,6 +23,7 @@ from nova.compute import claims from nova.compute import instance_types from nova.compute import task_states from nova.compute import vm_states +from nova import conductor from nova import context from nova import db from nova import exception @@ -63,6 +64,7 @@ class ResourceTracker(object): self.stats = importutils.import_object(CONF.compute_stats_class) self.tracked_instances = {} self.tracked_migrations = {} + self.conductor_api = conductor.API() @lockutils.synchronized(COMPUTE_RESOURCE_SEMAPHORE, 'nova-') def instance_claim(self, context, instance_ref, limits=None): @@ -183,9 +185,8 @@ class ResourceTracker(object): """ values = {'host': self.host, 'node': self.nodename, 'launched_on': self.host} - (old_ref, new_ref) = db.instance_update_and_get_original(context, - instance_ref['uuid'], values) - notifications.send_update(context, old_ref, new_ref) + self.conductor_api.instance_update(context, instance_ref['uuid'], + **values) instance_ref['host'] = self.host instance_ref['launched_on'] = self.host diff --git a/nova/conductor/manager.py b/nova/conductor/manager.py index 53a3dc745..824875b3c 100644 --- a/nova/conductor/manager.py +++ b/nova/conductor/manager.py @@ -29,7 +29,7 @@ allowed_updates = ['task_state', 'vm_state', 'expected_task_state', 'power_state', 'access_ip_v4', 'access_ip_v6', 'launched_at', 'terminated_at', 'host', 'node', 'memory_mb', 'vcpus', 'root_gb', 'ephemeral_gb', - 'instance_type_id', 'root_device_name', 'host', + 'instance_type_id', 'root_device_name', 'launched_on', 'progress', 'vm_mode', 'default_ephemeral_device', 'default_swap_device', 'root_device_name', ] |