openstack
/
cinder
Code Issues Proposed changes

Add missing coordination=True on service start 

In the main() for starting the volume service, the coordination
param needs to be passed on Service.create when
CONF.enabled_backends is False. This is already being done when
all cinder services are starting up, so just an oversight.

Change-Id: I036e3baf15d848125e115e9f146af1c930c6faba
Closes-Bug: #1594835
This commit is contained in:
Carl Pecinovsky 2016-06-22 13:04:28 -04:00
parent 8110c9fc50
commit de3794ad93
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cinder/cmd/volume.py
View File

@ -91,7 +91,8 @@ def main():
launcher.launch_service(server)
service_started = True
else:
server = service.Service.create(binary='cinder-volume')
server = service.Service.create(binary='cinder-volume',
coordination=True)
launcher.launch_service(server)
service_started = True

10
cinder/tests/unit/test_cmd.py
View File

@ -345,7 +345,8 @@ class TestCinderVolumeCmd(test.TestCase):
log_setup.assert_called_once_with(CONF, "cinder")
monkey_patch.assert_called_once_with()
get_launcher.assert_called_once_with()
service_create.assert_called_once_with(binary='cinder-volume')
service_create.assert_called_once_with(binary='cinder-volume',
coordination=True)
launcher.launch_service.assert_called_once_with(server)
launcher.wait.assert_called_once_with()
@ -357,6 +358,7 @@ class TestCinderVolumeCmd(test.TestCase):
get_launcher):
backends = ['backend1', 'backend2']
CONF.set_override('enabled_backends', backends)
CONF.set_override('host', 'host')
launcher = get_launcher.return_value
cinder_volume.main()
@ -366,7 +368,11 @@ class TestCinderVolumeCmd(test.TestCase):
log_setup.assert_called_once_with(CONF, "cinder")
monkey_patch.assert_called_once_with()
get_launcher.assert_called_once_with()
self.assertEqual(len(backends), service_create.call_count)
c1 = mock.call(binary='cinder-volume', host='host@backend1',
service_name='backend1', coordination=True)
c2 = mock.call(binary='cinder-volume', host='host@backend2',
service_name='backend2', coordination=True)
service_create.assert_has_calls([c1, c2])
self.assertEqual(len(backends), launcher.launch_service.call_count)
launcher.wait.assert_called_once_with()