openstack/cinder
Code Issues Proposed changes

Update backend state when extending volume

Browse Source 
Rather than update the backend state in the next
period task, update it directly in scheduler when
extending.

Change-Id: Idc59abcd574a7eef354d6590f7b748c6b54df8b4
Closes-Bug: #1706888
This commit is contained in:
TommyLike 2017-07-27 17:09:20 +08:00
parent 48630526e2
commit a8776a726e
3 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cinder/scheduler/manager.py
View File

@ -348,9 +348,12 @@ class SchedulerManager(manager.CleanableManager, manager.Manager):
filter_properties['new_size'] = new_size
try:
self.driver.backend_passes_filters(context,
volume.service_topic_queue,
request_spec, filter_properties)
backend_state = self.driver.backend_passes_filters(
context,
volume.service_topic_queue,
request_spec, filter_properties)
backend_state.consume_from_volume(
{'size': new_size - volume.size})
volume_rpcapi.VolumeAPI().extend_volume(context, volume, new_size,
reservations)
except exception.NoValidBackend as ex:

40
cinder/tests/unit/scheduler/test_scheduler.py
View File

@ -32,6 +32,7 @@ from cinder.scheduler import manager
from cinder import test
from cinder.tests.unit import fake_constants as fake
from cinder.tests.unit import fake_volume
from cinder.tests.unit.scheduler import fakes as fake_scheduler
from cinder.tests.unit import utils as tests_utils
CONF = cfg.CONF
@ -100,6 +101,45 @@ class SchedulerManagerTestCase(test.TestCase):
mock_clean.assert_called_once_with(self.context)
@mock.patch('cinder.scheduler.driver.Scheduler.backend_passes_filters')
@mock.patch(
'cinder.scheduler.host_manager.BackendState.consume_from_volume')
@mock.patch('cinder.volume.rpcapi.VolumeAPI.extend_volume')
def test_extend_volume(self, mock_extend,
mock_consume, mock_backend_passes):
volume = fake_volume.fake_volume_obj(self.context, **{'size': 1})
fake_backend = fake_scheduler.FakeBackendState('host1', {})
mock_backend_passes.return_value = fake_backend
self.manager.extend_volume(self.context, volume, 2, 'fake_reservation')
mock_consume.assert_called_once_with({'size': 1})
mock_extend.assert_called_once_with(
self.context, volume, 2, 'fake_reservation')
@mock.patch('cinder.scheduler.driver.Scheduler.backend_passes_filters')
@mock.patch(
'cinder.scheduler.host_manager.BackendState.consume_from_volume')
@mock.patch('cinder.volume.rpcapi.VolumeAPI.extend_volume')
@mock.patch('cinder.quota.QUOTAS.rollback')
def test_extend_volume_no_valid_host(self, mock_rollback, mock_extend,
mock_consume, mock_backend_passes):
volume = fake_volume.fake_volume_obj(self.context, **{'size': 1})
no_valid_backend = exception.NoValidBackend(reason='')
mock_backend_passes.side_effect = [no_valid_backend]
with mock.patch.object(self.manager,
'_set_volume_state_and_notify') as mock_notify:
self.manager.extend_volume(self.context, volume, 2,
'fake_reservation')
mock_notify.assert_called_once_with(
'extend_volume', {'volume_state': {'status': 'available'}},
self.context, no_valid_backend, None)
mock_rollback.assert_called_once_with(
self.context, 'fake_reservation', project_id=volume.project_id)
mock_consume.assert_not_called()
mock_extend.assert_not_called()
@mock.patch('cinder.quota.QuotaEngine.expire')
def test_clean_expired_reservation(self, mock_clean):

3
releasenotes/notes/bug-1706888-update-backend-when-extending-3e4a9831a0w29d68.yaml Normal file
View File

@ -0,0 +1,3 @@
---
fixes:
- Update backend state in scheduler when extending volume.