diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-05 00:24:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-05 00:24:16 +0000 |
| commit | b0fdc223a8a3aa85e0fc4f332b1477d9c488b0b7 (patch) | |
| tree | 9798a716c7bdf01ebccb1dbc61e55423d4a4dd9e | |
| parent | 599843e106d453d55f75b96ba7591ba5b615ec92 (diff) | |
| parent | 334d7b8d25b0aa9b41b578df8309497e34b0a05f (diff) | |
| download | nova-b0fdc223a8a3aa85e0fc4f332b1477d9c488b0b7.tar.gz nova-b0fdc223a8a3aa85e0fc4f332b1477d9c488b0b7.tar.xz nova-b0fdc223a8a3aa85e0fc4f332b1477d9c488b0b7.zip | |
Merge "Fix race in resource tracker"
| -rw-r--r-- | nova/compute/resource_tracker.py | 5 | ||||
| -rw-r--r-- | nova/tests/compute/test_resource_tracker.py | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/nova/compute/resource_tracker.py b/nova/compute/resource_tracker.py index 1c653b8ca..c784fd83d 100644 --- a/nova/compute/resource_tracker.py +++ b/nova/compute/resource_tracker.py @@ -503,7 +503,10 @@ class ResourceTracker(object): resources['running_vms'] = 0 for instance in instances: - self._update_usage_from_instance(resources, instance) + if instance['vm_state'] == vm_states.DELETED: + continue + else: + self._update_usage_from_instance(resources, instance) def _find_orphaned_instances(self): """Given the set of instances and migrations already account for diff --git a/nova/tests/compute/test_resource_tracker.py b/nova/tests/compute/test_resource_tracker.py index 3f3962c8f..92edd34b5 100644 --- a/nova/tests/compute/test_resource_tracker.py +++ b/nova/tests/compute/test_resource_tracker.py @@ -601,6 +601,15 @@ class InstanceClaimTestCase(BaseTrackerTestCase): self.tracker.update_usage(self.context, instance) self.assertEqual(1, self.tracker.compute_node['vcpus_used']) + def test_skip_deleted_instances(self): + # ensure that the audit process skips instances that have vm_state + # DELETED, but the DB record is not yet deleted. + self._fake_instance(vm_state=vm_states.DELETED, host=self.host) + self.tracker.update_available_resource(self.context) + + self.assertEqual(0, self.tracker.compute_node['memory_mb_used']) + self.assertEqual(0, self.tracker.compute_node['local_gb_used']) + class ResizeClaimTestCase(BaseTrackerTestCase): |