From a8941345c97cccb9171e3d1e172f607dc8d17e6a Mon Sep 17 00:00:00 2001
From: Josh Kearney <josh@jk0.org>
Date: Fri, 13 May 2011 09:47:08 -0500
Subject: Make set_admin_password non-blocking to API.

---
 nova/api/openstack/servers.py | 6 ++++--
 nova/compute/api.py           | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'nova')

diff --git a/nova/api/openstack/servers.py b/nova/api/openstack/servers.py
index 547310613..aaff57b4a 100644
--- a/nova/api/openstack/servers.py
+++ b/nova/api/openstack/servers.py
@@ -14,6 +14,7 @@
 #    under the License.
 
 import base64
+import eventlet
 import traceback
 
 from webob import exc
@@ -175,8 +176,9 @@ class Controller(common.OpenstackController):
         builder = self._get_view_builder(req)
         server = builder.build(inst, is_detail=True)
         server['server']['adminPass'] = password
-        self.compute_api.set_admin_password(context, server['server']['id'],
-                                            password)
+        # We don't want this to block
+        eventlet.spawn(self.compute_api.set_admin_password(
+            context, server['server']['id'], password))
         return server
 
     def _deserialize_create(self, request):
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 63884be97..1c28b6a89 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -484,7 +484,7 @@ class API(base.Base):
 
     def _find_host(self, context, instance_id):
         """Find the host associated with an instance."""
-        for attempts in xrange(10):
+        for attempts in xrange(30):
             instance = self.get(context, instance_id)
             host = instance["host"]
             if host:
-- 
cgit