From 4f780f9e7a9c2218218c7ea4dec8c985cb69261f Mon Sep 17 00:00:00 2001
From: Andy Smith <code@term.ie>
Date: Thu, 9 Dec 2010 14:36:23 -0800
Subject: [PATCH] make nova binaries use eventlet

---
 bin/nova-api             | 10 +++++-----
 bin/nova-combined        | 14 +++++++++++---
 bin/nova-compute         |  1 +
 bin/nova-network         |  1 +
 bin/nova-scheduler       | 15 ++++++---------
 bin/nova-volume          | 15 ++++++---------
 nova/service_eventlet.py |  4 +++-
 7 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/bin/nova-api b/bin/nova-api
index a9c53dbc..3215ad5e 100755
--- a/bin/nova-api
+++ b/bin/nova-api
@@ -32,9 +32,11 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
+from nova import api
 from nova import flags
 from nova import utils
 from nova import server
+from nova import wsgi
 
 FLAGS = flags.FLAGS
 flags.DEFINE_integer('osapi_port', 8774, 'OpenStack API port')
@@ -43,9 +45,8 @@ flags.DEFINE_integer('ec2api_port', 8773, 'EC2 API port')
 flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host')
 
 
-def main(_args):
-    from nova import api
-    from nova import wsgi
+def main():
+    FLAGS(sys.argv)
     server = wsgi.Server()
     server.start(api.API('os'), FLAGS.osapi_port, host=FLAGS.osapi_host)
     server.start(api.API('ec2'), FLAGS.ec2api_port, host=FLAGS.ec2api_host)
@@ -53,5 +54,4 @@ def main(_args):
 
 
 if __name__ == '__main__':
-    utils.default_flagfile()
-    server.serve('nova-api', main)
+    main()
diff --git a/bin/nova-combined b/bin/nova-combined
index 65865acd..c8658432 100755
--- a/bin/nova-combined
+++ b/bin/nova-combined
@@ -27,8 +27,6 @@ eventlet.monkey_patch()
 import os
 import sys
 
-from eventlet import greenthread
-
 # If ../nova/__init__.py exists, add ../ to Python search path, so that
 # it will override what happens to be installed in /usr/(local/)lib/python...
 possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
@@ -46,6 +44,12 @@ from nova import wsgi
 FLAGS = flags.FLAGS
 flags.DEFINE_integer('api_port', 8773, 'API port')
 
+FLAGS = flags.FLAGS
+flags.DEFINE_integer('osapi_port', 8774, 'OpenStack API port')
+flags.DEFINE_string('osapi_host', '0.0.0.0', 'OpenStack API host')
+flags.DEFINE_integer('ec2api_port', 8773, 'EC2 API port')
+flags.DEFINE_string('ec2api_host', '0.0.0.0', 'EC2 API host')
+
 
 if __name__ == '__main__':
     FLAGS(sys.argv)
@@ -57,5 +61,9 @@ if __name__ == '__main__':
     #objectstore = service_eventlet.Service.create(binary='nova-objectstore')
 
     service_eventlet.serve(compute, network, volume, scheduler)
-    wsgi.run_server(api.API(), FLAGS.api_port)
+
+    server = wsgi.Server()
+    server.start(api.API('os'), FLAGS.osapi_port, host=FLAGS.osapi_host)
+    server.start(api.API('ec2'), FLAGS.ec2api_port, host=FLAGS.ec2api_host)
+    server.wait()
     
diff --git a/bin/nova-compute b/bin/nova-compute
index 600fbb89..307f7cb5 100755
--- a/bin/nova-compute
+++ b/bin/nova-compute
@@ -39,3 +39,4 @@ from nova import service_eventlet
 
 if __name__ == '__main__':
     service_eventlet.serve()
+    service_eventlet.wait()
diff --git a/bin/nova-network b/bin/nova-network
index 600fbb89..307f7cb5 100755
--- a/bin/nova-network
+++ b/bin/nova-network
@@ -39,3 +39,4 @@ from nova import service_eventlet
 
 if __name__ == '__main__':
     service_eventlet.serve()
+    service_eventlet.wait()
diff --git a/bin/nova-scheduler b/bin/nova-scheduler
index 4d1a40cf..e4aa0dca 100755
--- a/bin/nova-scheduler
+++ b/bin/nova-scheduler
@@ -21,6 +21,9 @@
   Twistd daemon for the nova scheduler nodes.
 """
 
+import eventlet
+eventlet.monkey_patch()
+
 import os
 import sys
 
@@ -32,14 +35,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-from nova import service
-from nova import twistd
-from nova import utils
-
+from nova import service_eventlet
 
 if __name__ == '__main__':
-    utils.default_flagfile()
-    twistd.serve(__file__)
-
-if __name__ == '__builtin__':
-    application = service.Service.create()
+    service_eventlet.serve()
+    service_eventlet.wait()
diff --git a/bin/nova-volume b/bin/nova-volume
index e7281d6c..395d1604 100755
--- a/bin/nova-volume
+++ b/bin/nova-volume
@@ -21,6 +21,9 @@
   Twistd daemon for the nova volume nodes.
 """
 
+import eventlet
+eventlet.monkey_patch()
+
 import os
 import sys
 
@@ -32,14 +35,8 @@ possible_topdir = os.path.normpath(os.path.join(os.path.abspath(sys.argv[0]),
 if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
     sys.path.insert(0, possible_topdir)
 
-from nova import service
-from nova import twistd
-from nova import utils
-
+from nova import service_eventlet
 
 if __name__ == '__main__':
-    utils.default_flagfile()
-    twistd.serve(__file__)
-
-if __name__ == '__builtin__':
-    application = service.Service.create()  # pylint: disable-msg=C0103
+    service_eventlet.serve()
+    service_eventlet.wait()
diff --git a/nova/service_eventlet.py b/nova/service_eventlet.py
index eac45a98..82291ffe 100644
--- a/nova/service_eventlet.py
+++ b/nova/service_eventlet.py
@@ -285,4 +285,6 @@ def serve(*services):
     #while True:
     #    greenthread.sleep(5)
 
-     
+def wait():
+    while True:
+        greenthread.sleep(5)