summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJian Wen <wenjianhn@gmail.com>2012-09-03 16:14:44 +0800
committerJian Wen <wenjianhn@gmail.com>2012-09-03 16:17:32 +0800
commitb9f1138be0c982edcfcfb289f64c356e00dd95d0 (patch)
tree2f9d6eab93f245531e70047dcb7047e461b79316
parentca6505ef66ecdd948325ee37b627e813cc5ad56d (diff)
downloadnova-b9f1138be0c982edcfcfb289f64c356e00dd95d0.tar.gz
nova-b9f1138be0c982edcfcfb289f64c356e00dd95d0.tar.xz
nova-b9f1138be0c982edcfcfb289f64c356e00dd95d0.zip
Fixes sqlalchemy.api.compute_node_get_by_host
Use join('service') instead of options(joinedload('service')) to get the right compute_node Fixes bug 1044238 Change-Id: I082a46847e63a1e21083a625c3b07ec9be05412f
-rw-r--r--nova/db/sqlalchemy/api.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index d9c157c21..106c8b8ed 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -593,7 +593,7 @@ def compute_node_get_by_host(context, host):
session = get_session()
with session.begin():
node = session.query(models.ComputeNode).\
- options(joinedload('service')).\
+ join('service').\
filter(models.Service.host == host).\
filter_by(deleted=False)
return node.first()