From c3eb788637f21bc8887daa0bbe6784a232bf39d3 Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Wed, 22 May 2013 10:14:38 -0400 Subject: [PATCH] Improve "service is down or disabled" warning message Include "volume" and host in this message to make it more useful. Change-Id: I2cacc7373de3a1b51762df2844a46b393d96c6cc --- cinder/scheduler/host_manager.py | 7 ++++--- cinder/tests/scheduler/test_host_manager.py | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cinder/scheduler/host_manager.py b/cinder/scheduler/host_manager.py index 9dd2182f0..acc024f53 100644 --- a/cinder/scheduler/host_manager.py +++ b/cinder/scheduler/host_manager.py @@ -262,10 +262,11 @@ class HostManager(object): topic = FLAGS.volume_topic volume_services = db.service_get_all_by_topic(context, topic) for service in volume_services: - if not utils.service_is_up(service) or service['disabled']: - LOG.warn(_("service is down or disabled.")) - continue host = service['host'] + if not utils.service_is_up(service) or service['disabled']: + LOG.warn(_("volume service is down or disabled. " + "(host: %s)") % host) + continue capabilities = self.service_states.get(host, None) host_state = self.host_state_map.get(host) if host_state: diff --git a/cinder/tests/scheduler/test_host_manager.py b/cinder/tests/scheduler/test_host_manager.py index 6196444dc..2a3558fc9 100644 --- a/cinder/tests/scheduler/test_host_manager.py +++ b/cinder/tests/scheduler/test_host_manager.py @@ -145,7 +145,8 @@ class HostManagerTestCase(test.TestCase): ret_services = fakes.VOLUME_SERVICES db.service_get_all_by_topic(context, topic).AndReturn(ret_services) # Disabled service - host_manager.LOG.warn("service is down or disabled.") + host_manager.LOG.warn("volume service is down or disabled. " + "(host: host5)") self.mox.ReplayAll() self.host_manager.get_all_host_states(context)