diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-23 15:19:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-23 15:19:33 +0000 |
| commit | 979abde683b3c606b76da22bac90f2c9fb1920f9 (patch) | |
| tree | 9fb16013230986f7e23e9daa2281a3fc0b154fd3 /nova/compute | |
| parent | bfc3a3ccb2811cc8a96a15987528e6639ec029bf (diff) | |
| parent | 231964f76532dac66289448dba6b035594010d4c (diff) | |
Merge "Add option to exclude joins from instance_get_by_uuid"
Diffstat (limited to 'nova/compute')
| -rwxr-xr-x | nova/compute/manager.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 5da050f60..7fbe8910e 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -3798,7 +3798,8 @@ class ComputeManager(manager.SchedulerDependentManager): # We re-query the DB to get the latest instance info to minimize # (not eliminate) race condition. u = self.conductor_api.instance_get_by_uuid(context, - db_instance['uuid']) + db_instance['uuid'], + columns_to_join=[]) db_power_state = u["power_state"] vm_state = u['vm_state'] |