From 231964f76532dac66289448dba6b035594010d4c Mon Sep 17 00:00:00 2001 From: Andrew Laski Date: Thu, 11 Apr 2013 20:56:53 -0400 Subject: Add option to exclude joins from instance_get_by_uuid Some callers of instance_get_by_uuid do not need the data that it joins by default. This allows the caller the choice of getting it or not. Specifically in this case the _sync_power_state periodic task is pulling it unnecessarily. Change-Id: I48cc2ea1de993b87ce6f96f4877c8d8513f507e2 --- nova/compute/manager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'nova/compute') diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 21c707004..c01fced5d 100755 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -3794,7 +3794,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'] -- cgit