diff options
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 58625fc8b..6c3d7044f 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -1744,14 +1744,14 @@ class ComputeManager(manager.SchedulerDependentManager): power_state=vm_power_state) def _reclaim_queued_deletes(self, context): - # Find all instances that are queued for deletion + "Reclaim instances that are queued for deletion." + instances = self.db.instance_get_all_by_host(context, self.host) + queue_time = datetime.timedelta(seconds=FLAGS.delete_instance_interval) curtime = utils.utcnow() for instance in instances: - LOG.info('name: %r, state: %r, deleted_at: %r' % (instance['name'], instance['task_state'], instance['deleted_at'])) if instance['task_state'] == task_states.QUEUED_DELETE and \ - (curtime - instance['deleted_at'] >= - datetime.timedelta(seconds=FLAGS.delete_instance_interval)): + (curtime - instance['deleted_at']) >= queue_time: LOG.info('Deleting %s' % instance['name']) self._delete_instance(context, instance['id']) |