diff options
| author | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-02 14:14:52 -0700 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@yahoo.com> | 2010-09-02 14:14:52 -0700 |
| commit | e992234e1150b4c5a5ef6f12e6e729ca9e7d8e23 (patch) | |
| tree | 293008ad18eb2b6af30f1af37f0814146fbc69ac | |
| parent | 57d02103c4d33c009fef0405e541eb30d273b21e (diff) | |
| parent | 2ecde345023c4a509b39afb6dbd97071684b3539 (diff) | |
merged trunk and cleaned up test
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 1 | ||||
| -rw-r--r-- | nova/scheduler/simple.py | 1 | ||||
| -rw-r--r-- | nova/service.py | 5 | ||||
| -rw-r--r-- | nova/tests/scheduler_unittest.py | 5 |
4 files changed, 6 insertions, 6 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 07b0a43ff..003e47070 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -59,7 +59,6 @@ def daemon_get_all_compute_sorted(_context): # FROM daemons LEFT OUTER JOIN # (SELECT host, count(*) AS instance_count # FROM instances GROUP BY host) AS inst_count - print 'instance', models.Instance.find(1).host subq = session.query(models.Instance.host, func.count('*').label('instance_count')) \ .filter_by(deleted=False) \ diff --git a/nova/scheduler/simple.py b/nova/scheduler/simple.py index 6c76fd322..294dc1118 100644 --- a/nova/scheduler/simple.py +++ b/nova/scheduler/simple.py @@ -46,6 +46,7 @@ class SimpleScheduler(driver.Scheduler): results = db.daemon_get_all_compute_sorted(context) for result in results: (daemon, instance_count) = result + print daemon.host, instance_count if instance_count >= FLAGS.max_instances: raise driver.NoValidHost("All hosts have too many instances") if self.daemon_is_up(daemon): diff --git a/nova/service.py b/nova/service.py index 738816631..198d3e3c6 100644 --- a/nova/service.py +++ b/nova/service.py @@ -44,13 +44,12 @@ flags.DEFINE_integer('report_interval', 10, class Service(object, service.Service): """Base class for workers that run on hosts.""" - def __init__(self, host, binary, topic, manager, - db_driver=None, *args, **kwargs): + def __init__(self, host, binary, topic, manager, *args, **kwargs): self.host = host self.binary = binary self.topic = topic manager_class = utils.import_class(manager) - self.manager = manager_class(host, db_driver) + self.manager = manager_class(host=host, *args, **kwargs) self.model_disconnected = False super(Service, self).__init__(*args, **kwargs) diff --git a/nova/tests/scheduler_unittest.py b/nova/tests/scheduler_unittest.py index 4d4f649d0..45ffac438 100644 --- a/nova/tests/scheduler_unittest.py +++ b/nova/tests/scheduler_unittest.py @@ -110,8 +110,9 @@ class SchedulerTestCase(test.TrialTestCase): FLAGS.compute_manager) instance_ids = [] for index in xrange(FLAGS.max_instances): - instance_ids.append(self._create_instance()) - service1.run_instance(self.context, instance_ids[index]) + instance_id = self._create_instance() + service1.run_instance(self.context, instance_id) + instance_ids.append(instance_id) instance_id = self._create_instance() self.assertRaises(driver.NoValidHost, self.scheduler.driver.pick_compute_host, |