diff options
| author | Josh Kearney <josh@jk0.org> | 2011-08-04 15:22:36 -0500 |
|---|---|---|
| committer | Josh Kearney <josh@jk0.org> | 2011-08-04 15:22:36 -0500 |
| commit | eca23b1ad18a8626dd68cded4d488ca1aa779f69 (patch) | |
| tree | e5d807eeb1ee3eb07366ed8c1b427c3a91322fac | |
| parent | b8d4004e9de28dae47c6a1772a0caac965f7a69f (diff) | |
| download | nova-eca23b1ad18a8626dd68cded4d488ca1aa779f69.tar.gz nova-eca23b1ad18a8626dd68cded4d488ca1aa779f69.tar.xz nova-eca23b1ad18a8626dd68cded4d488ca1aa779f69.zip | |
Removed debugging code.
| -rw-r--r-- | nova/compute/manager.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index c6af0dfbe..cf4ee229d 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -651,15 +651,16 @@ class ComputeManager(manager.SchedulerDependentManager): def rescue_instance(self, context, instance_id): """Rescue an instance on this host.""" context = context.elevated() - self._update_state(context, instance_id) instance_ref = self.db.instance_get(context, instance_id) LOG.audit(_('instance %s: rescuing'), instance_id, context=context) self.db.instance_set_state(context, instance_id, power_state.NOSTATE, 'rescuing') + _update_state = lambda result: self._update_state_callback( + self, context, instance_id, result) network_info = self._get_instance_nw_info(context, instance_ref) - self.driver.rescue(context, instance_ref, None, network_info) + self.driver.rescue(context, instance_ref, _update_state, network_info) self._update_state(context, instance_id) @exception.wrap_exception(notifier=notifier, publisher_id=publisher_id()) @@ -667,15 +668,16 @@ class ComputeManager(manager.SchedulerDependentManager): def unrescue_instance(self, context, instance_id): """Rescue an instance on this host.""" context = context.elevated() - self._update_state(context, instance_id) instance_ref = self.db.instance_get(context, instance_id) LOG.audit(_('instance %s: unrescuing'), instance_id, context=context) self.db.instance_set_state(context, instance_id, power_state.NOSTATE, 'unrescuing') + _update_state = lambda result: self._update_state_callback( + self, context, instance_id, result) network_info = self._get_instance_nw_info(context, instance_ref) - self.driver.unrescue(instance_ref, None, network_info) + self.driver.unrescue(instance_ref, _update_state, network_info) self._update_state(context, instance_id) @staticmethod |