openstack
/
cinder
Code Issues Proposed changes

Merge "Add filter_function and goodness_function to pools"

This commit is contained in:
Zuul 2020-04-22 13:24:58 +00:00 committed by Gerrit Code Review
parent 0dab916125 06d1fb3569
commit 1de2602e62
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cinder/scheduler/host_manager.py
View File

@ -126,8 +126,10 @@ class BackendState(object):
self.thin_provisioning_support = False
self.thick_provisioning_support = False
# Does this backend support attaching a volume to more than
# once host/instance?
# one host/instance?
self.multiattach = False
self.filter_function = None
self.goodness_function = 0
# PoolState for all pools
self.pools = {}
@ -290,6 +292,15 @@ class BackendState(object):
if not pool_cap.get('timestamp', None):
pool_cap['timestamp'] = self.updated
if('filter_function' not in pool_cap and
'filter_function' in self.capabilities):
pool_cap['filter_function'] = self.capabilities['filter_function']
if('goodness_function' not in pool_cap and
'goodness_function' in self.capabilities):
pool_cap['goodness_function'] = (
self.capabilities['goodness_function'])
def update_backend(self, capability):
self.volume_backend_name = capability.get('volume_backend_name', None)
self.vendor_name = capability.get('vendor_name', None)
@ -386,6 +397,9 @@ class PoolState(BackendState):
self.multiattach = capability.get('multiattach', False)
self.filter_function = capability.get('filter_function', None)
self.goodness_function = capability.get('goodness_function', 0)
def update_pools(self, capability):
# Do nothing, since we don't have pools within pool, yet
pass

45
cinder/tests/unit/scheduler/test_host_manager.py
View File

@ -19,6 +19,7 @@ from datetime import timedelta
from unittest import mock
import ddt
from oslo_config import cfg
from oslo_serialization import jsonutils
from oslo_utils import timeutils
@ -33,6 +34,8 @@ from cinder import test
from cinder.tests.unit import fake_constants as fake
from cinder.tests.unit.objects import test_service
CONF = cfg.CONF
class FakeFilterClass1(filters.BaseBackendFilter):
def backend_passes(self, host_state, filter_properties):
@ -1457,6 +1460,48 @@ class BackendStateTestCase(test.TestCase):
self.assertEqual(0,
fake_backend.pools['_pool0'].provisioned_capacity_gb)
def test_filter_goodness_default_capabilities(self):
self.addCleanup(CONF.clear_override, 'filter_function')
self.addCleanup(CONF.clear_override, 'goodness_function')
CONF.set_override('filter_function', '2')
CONF.set_override('goodness_function', '4')
capability = {
'filter_function': CONF.filter_function,
'goodness_function': CONF.goodness_function,
'timestamp': None,
'pools': [{'pool_name': 'fake_pool'}]
}
fake_backend = host_manager.BackendState('host1', None)
fake_backend.update_from_volume_capability(capability)
pool_cap = fake_backend.pools['fake_pool']
self.assertEqual('2', pool_cap.filter_function)
self.assertEqual('4', pool_cap.goodness_function)
def test_append_backend_info_custom_capabilities(self):
pool_cap = {
'pool_name': 'pool1',
'total_capacity_gb': 30.01,
'free_capacity_gb': 28.01,
'allocated_capacity_gb': 2.0,
'provisioned_capacity_gb': 2.0,
'max_over_subscription_ratio': '1.0',
'thin_provisioning_support': False,
'thick_provisioning_support': True,
'reserved_percentage': 5
}
volume_capability = {'filter_function': 5,
'goodness_function': 10}
fake_backend = host_manager.BackendState(
'host1', None, capabilities=volume_capability)
fake_backend._append_backend_info(pool_cap)
self.assertEqual(5, pool_cap['filter_function'])
self.assertEqual(10, pool_cap['goodness_function'])
class PoolStateTestCase(test.TestCase):
"""Test case for BackendState class."""