From ca2d92adca424d47d279809aad7218ab08e7b25b Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@gmail.com>
Date: Thu, 15 Mar 2012 13:02:07 -0700
Subject: [PATCH] Keep context for logging intact in greenthreads

 * fixes bug 942918

Change-Id: Ia0fcf459c53b95a8675472adcfbba08014e34e5b
---
 nova/rpc/amqp.py        | 2 +-
 nova/rpc/impl_carrot.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nova/rpc/amqp.py b/nova/rpc/amqp.py
index 367eaf1e..e620ea36 100644
--- a/nova/rpc/amqp.py
+++ b/nova/rpc/amqp.py
@@ -244,7 +244,7 @@ class ProxyCallback(object):
         """Thread that magically looks for a method on the proxy
         object and calls it.
         """
-
+        ctxt.update_store()
         try:
             node_func = getattr(self.proxy, str(method))
             node_args = dict((str(k), v) for k, v in args.iteritems())
diff --git a/nova/rpc/impl_carrot.py b/nova/rpc/impl_carrot.py
index cc124c25..22586b1a 100644
--- a/nova/rpc/impl_carrot.py
+++ b/nova/rpc/impl_carrot.py
@@ -283,7 +283,7 @@ class AdapterConsumer(Consumer):
         """Thread that magically looks for a method on the proxy
         object and calls it.
         """
-
+        ctxt.update_store()
         node_func = getattr(self.proxy, str(method))
         node_args = dict((str(k), v) for k, v in args.iteritems())
         # NOTE(vish): magic is fun!