summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-01-18 18:22:54 +0000
committerGerrit Code Review <review@openstack.org>2013-01-18 18:22:54 +0000
commitfa03b1c6ca1fcb45269fe8a6e869ed92dafae602 (patch)
treef6c671a45cda7e43499a87f3c18cfcd38bfc79aa
parent86fd2c7a5c77ea8933624d300f62e2149359d289 (diff)
parent6d650eb1fc602aa3552b20aea55c66106e04a27d (diff)
downloadnova-fa03b1c6ca1fcb45269fe8a6e869ed92dafae602.tar.gz
nova-fa03b1c6ca1fcb45269fe8a6e869ed92dafae602.tar.xz
nova-fa03b1c6ca1fcb45269fe8a6e869ed92dafae602.zip
Merge "Cells: Fix for relaying instance info_cache updates"
-rw-r--r--nova/db/api.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/nova/db/api.py b/nova/db/api.py
index 13873936b..d8a16c52d 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -759,12 +759,13 @@ def instance_info_cache_update(context, instance_uuid, values,
:param values: = dict containing column values to update
"""
rv = IMPL.instance_info_cache_update(context, instance_uuid, values)
- try:
- cells_rpcapi.CellsAPI().instance_info_cache_update_at_top(context,
- rv)
- except Exception:
- LOG.exception(_("Failed to notify cells of instance info cache "
- "update"))
+ if update_cells:
+ try:
+ cells_rpcapi.CellsAPI().instance_info_cache_update_at_top(
+ context, rv)
+ except Exception:
+ LOG.exception(_("Failed to notify cells of instance info "
+ "cache update"))
return rv