openstack
/
nova
Code Issues Proposed changes

Merge "Apply scheduler limits to Exact* filters" into stable/liberty

This commit is contained in:
Jenkins 2016-03-01 02:53:12 +00:00 committed by Gerrit Code Review
parent 8caf1aea32 19e7abad96
commit d0d0edb80f
6 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/scheduler/filters/exact_core_filter.py
View File

@ -48,4 +48,8 @@ class ExactCoreFilter(filters.BaseHostFilter):
'usable_vcpus': usable_vcpus})
return False
# NOTE(mgoddard): Setting the limit ensures that it is enforced in
# compute. This ensures that if multiple instances are scheduled to a
# single host, then all after the first will fail in the claim.
host_state.limits['vcpu'] = host_state.vcpus_total
return True

4
nova/scheduler/filters/exact_disk_filter.py
View File

@ -39,4 +39,8 @@ class ExactDiskFilter(filters.BaseHostFilter):
'usable_disk_mb': host_state.free_disk_mb})
return False
# NOTE(mgoddard): Setting the limit ensures that it is enforced in
# compute. This ensures that if multiple instances are scheduled to a
# single host, then all after the first will fail in the claim.
host_state.limits['disk_gb'] = host_state.total_usable_disk_gb
return True

4
nova/scheduler/filters/exact_ram_filter.py
View File

@ -36,4 +36,8 @@ class ExactRamFilter(filters.BaseHostFilter):
'usable_ram': host_state.free_ram_mb})
return False
# NOTE(mgoddard): Setting the limit ensures that it is enforced in
# compute. This ensures that if multiple instances are scheduled to a
# single host, then all after the first will fail in the claim.
host_state.limits['memory_mb'] = host_state.total_usable_ram_mb
return True

3
nova/tests/unit/scheduler/filters/test_exact_core_filter.py
View File

@ -25,11 +25,13 @@ class TestExactCoreFilter(test.NoDBTestCase):
filter_properties = {'instance_type': {'vcpus': 1}}
host = self._get_host({'vcpus_total': 3, 'vcpus_used': 2})
self.assertTrue(self.filt_cls.host_passes(host, filter_properties))
self.assertEqual(host.limits.get('vcpu'), 3)
def test_exact_core_filter_fails(self):
filter_properties = {'instance_type': {'vcpus': 2}}
host = self._get_host({'vcpus_total': 3, 'vcpus_used': 2})
self.assertFalse(self.filt_cls.host_passes(host, filter_properties))
self.assertNotIn('vcpu', host.limits)
def test_exact_core_filter_passes_no_instance_type(self):
filter_properties = {}
@ -40,6 +42,7 @@ class TestExactCoreFilter(test.NoDBTestCase):
filter_properties = {'instance_type': {'vcpus': 1}}
host = self._get_host({})
self.assertFalse(self.filt_cls.host_passes(host, filter_properties))
self.assertNotIn('vcpu', host.limits)
def _get_host(self, host_attributes):
return fakes.FakeHostState('host1', 'node1', host_attributes)

6
nova/tests/unit/scheduler/filters/test_exact_disk_filter.py
View File

@ -29,8 +29,11 @@ class TestExactDiskFilter(test.NoDBTestCase):
'swap': 1024
}
}
host = self._get_host({'free_disk_mb': 3 * 1024})
disk_gb = 3
host = self._get_host({'free_disk_mb': disk_gb * 1024,
'total_usable_disk_gb': disk_gb})
self.assertTrue(self.filt_cls.host_passes(host, filter_properties))
self.assertEqual(host.limits.get('disk_gb'), disk_gb)
def test_exact_disk_filter_fails(self):
filter_properties = {
@ -42,6 +45,7 @@ class TestExactDiskFilter(test.NoDBTestCase):
}
host = self._get_host({'free_disk_mb': 2 * 1024})
self.assertFalse(self.filt_cls.host_passes(host, filter_properties))
self.assertNotIn('disk_gb', host.limits)
def _get_host(self, host_attributes):
return fakes.FakeHostState('host1', 'node1', host_attributes)

6
nova/tests/unit/scheduler/filters/test_exact_ram_filter.py
View File

@ -23,13 +23,17 @@ class TestRamFilter(test.NoDBTestCase):
def test_exact_ram_filter_passes(self):
filter_properties = {'instance_type': {'memory_mb': 1024}}
host = self._get_host({'free_ram_mb': 1024})
ram_mb = 1024
host = self._get_host({'free_ram_mb': ram_mb,
'total_usable_ram_mb': ram_mb})
self.assertTrue(self.filt_cls.host_passes(host, filter_properties))
self.assertEqual(host.limits.get('memory_mb'), ram_mb)
def test_exact_ram_filter_fails(self):
filter_properties = {'instance_type': {'memory_mb': 512}}
host = self._get_host({'free_ram_mb': 1024})
self.assertFalse(self.filt_cls.host_passes(host, filter_properties))
self.assertNotIn('memory_mb', host.limits)
def _get_host(self, host_attributes):
return fakes.FakeHostState('host1', 'node1', host_attributes)