From 1f7388e70c00e111f64311e83b08d2ac124a5bf9 Mon Sep 17 00:00:00 2001 From: Ivy Zhang Date: Tue, 15 Mar 2016 05:25:36 -0400 Subject: [PATCH] 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 --- cinder/volume/manager.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/cinder/volume/manager.py b/cinder/volume/manager.py index 102fcdbf4..12bc5e0b7 100644 --- a/cinder/volume/manager.py +++ b/cinder/volume/manager.py @@ -522,9 +522,10 @@ class VolumeManager(manager.SchedulerDependentManager): stats = self.driver.get_volume_stats(refresh=True) svc_host = vol_utils.extract_host(self.host, 'backend') try: - service = objects.Service.get_by_host_and_topic( - context.get_admin_context(), svc_host, - CONF.volume_topic) + service = objects.Service.get_by_args( + context.get_admin_context(), + svc_host, + 'cinder-volume') except exception.ServiceNotFound: with excutils.save_and_reraise_exception(): LOG.error(_LE("Service not found for updating " -- 2.45.2