Merge lp:~soren/nova/lp654452 into lp:~hudson-openstack/nova/trunk

[Soren Hansen]

Move manager_class instantiation and db.service_* calls out of nova.service.Service.__init__ into a new nova.service.Service.startService method which gets called by twisted. This delays opening db connections (and thus sqlite file creation) until after privileges have been shed by twisted.

[Eric Day (eday)]

lgtm

review: Approve

[Jay Pipes (jaypipes)]

Add a # pylint: disable-msg C0103 because twisted.application.service.Service requires the method be called startService...

[lp:~soren/nova/lp654452]

320. By Soren Hansen on 2010-10-04

Add pylint thingamajig for startService (name defined by Twisted).

[Jay Pipes (jaypipes)]

review: Approve

=== modified file 'nova/service.py'
--- nova/service.py	2010-10-01 01:13:45 +0000
+++ nova/service.py	2010-10-04 19:05:53 +0000
@@ -52,11 +52,17 @@
         self.host = host
         self.binary = binary
         self.topic = topic
-        manager_class = utils.import_class(manager)
-        self.manager = manager_class(host=host, *args, **kwargs)
+        self.manager_class_name = manager
+        super(Service, self).__init__(*args, **kwargs)
+        self.saved_args, self.saved_kwargs = args, kwargs
+
+
+    def startService(self):  # pylint: disable-msg C0103
+        manager_class = utils.import_class(self.manager_class_name)
+        self.manager = manager_class(host=self.host, *self.saved_args,
+                                                     **self.saved_kwargs)
         self.manager.init_host()
         self.model_disconnected = False
-        super(Service, self).__init__(*args, **kwargs)
         try:
             service_ref = db.service_get_by_args(None,
                                                self.host,
 
=== modified file 'nova/tests/scheduler_unittest.py'
--- nova/tests/scheduler_unittest.py	2010-09-12 02:40:38 +0000
+++ nova/tests/scheduler_unittest.py	2010-10-04 19:05:53 +0000
@@ -117,10 +117,12 @@
                                    'nova-compute',
                                    'compute',
                                    FLAGS.compute_manager)
+        compute1.startService()
         compute2 = service.Service('host2',
                                    'nova-compute',
                                    'compute',
                                    FLAGS.compute_manager)
+        compute2.startService()
         hosts = self.scheduler.driver.hosts_up(self.context, 'compute')
         self.assertEqual(len(hosts), 2)
         compute1.kill()
@@ -132,10 +134,12 @@
                                    'nova-compute',
                                    'compute',
                                    FLAGS.compute_manager)
+        compute1.startService()
         compute2 = service.Service('host2',
                                    'nova-compute',
                                    'compute',
                                    FLAGS.compute_manager)
+        compute2.startService()
         instance_id1 = self._create_instance()
         compute1.run_instance(self.context, instance_id1)
         instance_id2 = self._create_instance()
@@ -153,10 +157,12 @@
                                    'nova-compute',
                                    'compute',
                                    FLAGS.compute_manager)
+        compute1.startService()
         compute2 = service.Service('host2',
                                    'nova-compute',
                                    'compute',
                                    FLAGS.compute_manager)
+        compute2.startService()
         instance_ids1 = []
         instance_ids2 = []
         for index in xrange(FLAGS.max_cores):
@@ -184,10 +190,12 @@
                                    'nova-volume',
                                    'volume',
                                    FLAGS.volume_manager)
+        volume1.startService()
         volume2 = service.Service('host2',
                                    'nova-volume',
                                    'volume',
                                    FLAGS.volume_manager)
+        volume2.startService()
         volume_id1 = self._create_volume()
         volume1.create_volume(self.context, volume_id1)
         volume_id2 = self._create_volume()
@@ -205,10 +213,12 @@
                                    'nova-volume',
                                    'volume',
                                    FLAGS.volume_manager)
+        volume1.startService()
         volume2 = service.Service('host2',
                                    'nova-volume',
                                    'volume',
                                    FLAGS.volume_manager)
+        volume2.startService()
         volume_ids1 = []
         volume_ids2 = []
         for index in xrange(FLAGS.max_gigabytes):
 
=== modified file 'nova/tests/service_unittest.py'
--- nova/tests/service_unittest.py	2010-09-12 23:02:22 +0000
+++ nova/tests/service_unittest.py	2010-10-04 19:05:53 +0000
@@ -22,6 +22,8 @@
 
 import mox
 
+from twisted.application.app import startApplication
+
 from nova import exception
 from nova import flags
 from nova import rpc
@@ -96,6 +98,7 @@
         self.mox.ReplayAll()
 
         app = service.Service.create(host=host, binary=binary)
+        startApplication(app, False)
         self.assert_(app)
 
     # We're testing sort of weird behavior in how report_state decides