Use get_by_args instead of get_by_host_and_topic
We already changed to use get_by_args, but in init_host_with_rpc, it still called get_by_host_and_topic instead of get_by_args. Which would cause restart a disabled cinder-volume service failed Change-Id: I10f562b4298e548f681030a71c828e3d2265e416 Closes-Bug: 1557366
This commit is contained in:
parent
e9cf76ab0f
commit
1f7388e70c
|
@ -522,9 +522,10 @@ class VolumeManager(manager.SchedulerDependentManager):
|
||||||
stats = self.driver.get_volume_stats(refresh=True)
|
stats = self.driver.get_volume_stats(refresh=True)
|
||||||
svc_host = vol_utils.extract_host(self.host, 'backend')
|
svc_host = vol_utils.extract_host(self.host, 'backend')
|
||||||
try:
|
try:
|
||||||
service = objects.Service.get_by_host_and_topic(
|
service = objects.Service.get_by_args(
|
||||||
context.get_admin_context(), svc_host,
|
context.get_admin_context(),
|
||||||
CONF.volume_topic)
|
svc_host,
|
||||||
|
'cinder-volume')
|
||||||
except exception.ServiceNotFound:
|
except exception.ServiceNotFound:
|
||||||
with excutils.save_and_reraise_exception():
|
with excutils.save_and_reraise_exception():
|
||||||
LOG.error(_LE("Service not found for updating "
|
LOG.error(_LE("Service not found for updating "
|
||||||
|
|
Loading…
Reference in New Issue