diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-11-06 07:20:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-11-06 07:20:37 +0000 |
| commit | b0efa623936bbe95efd467a166cb990266db2487 (patch) | |
| tree | 7487ac40ae426af2ed22f34272a7588d0a19d5eb /nova/compute | |
| parent | 181e44c9e5327392e5b4b9da18b5ce863780a3b1 (diff) | |
| parent | cfceed71dabfbac538e65bd1d5a95197beb94001 (diff) | |
Merge "Look up stuck-in-rebooting instances in manager"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index e06bbc4aa..de848abdd 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2670,7 +2670,10 @@ class ComputeManager(manager.SchedulerDependentManager): @manager.periodic_task def _poll_rebooting_instances(self, context): if FLAGS.reboot_timeout > 0: - self.driver.poll_rebooting_instances(FLAGS.reboot_timeout) + instances = self.db.instance_get_all_hung_in_rebooting( + context, FLAGS.reboot_timeout) + self.driver.poll_rebooting_instances(FLAGS.reboot_timeout, + instances) @manager.periodic_task def _poll_rescued_instances(self, context): |