summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Behrens <cbehrens@codestud.com>2013-01-18 08:16:01 +0000
committerChris Behrens <cbehrens@codestud.com>2013-01-18 08:16:01 +0000
commit6d650eb1fc602aa3552b20aea55c66106e04a27d (patch)
tree4ab677f58d35c72d83075776dabd8a5ba0326655
parente3a729b7c8873146d00d915a07094d327f97d184 (diff)
downloadnova-6d650eb1fc602aa3552b20aea55c66106e04a27d.tar.gz
nova-6d650eb1fc602aa3552b20aea55c66106e04a27d.tar.xz
nova-6d650eb1fc602aa3552b20aea55c66106e04a27d.zip
Cells: Fix for relaying instance info_cache updates
The update_cells argument was ignored in db/api.py. The API cell when doing an update calls this with False to prevent relaying the request back to itself... but it was being relayed anyway. Change-Id: I5a40c878a547e81605dc40f0077b7c6e20ee3ad4
-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