openstack/cinder
Code Issues Proposed changes

Merge "Make sure report_interval is less than service_down_time"

Browse Source
This commit is contained in:
Jenkins 2013-12-14 03:22:17 +00:00 committed by Gerrit Code Review
commit ecfbec563e
2 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cinder/service.py
View File

@ -540,11 +540,28 @@ class WSGIService(object):
self.app = self.loader.load_app(name)
self.host = getattr(CONF, '%s_listen' % name, "0.0.0.0")
self.port = getattr(CONF, '%s_listen_port' % name, 0)
self.basic_config_check()
self.server = wsgi.Server(name,
self.app,
host=self.host,
port=self.port)
def basic_config_check(self):
"""Perform basic config checks before starting service."""
# Make sure report interval is less than service down time
report_interval = CONF.report_interval
if CONF.service_down_time <= report_interval:
new_service_down_time = int(report_interval * 2.5)
LOG.warn(_("Report interval must be less than service down "
"time. Current config: <service_down_time: "
"%(service_down_time)s, report_interval: "
"%(report_interval)s>. Setting service_down_time to: "
"%(new_service_down_time)s") %
{'service_down_time': CONF.service_down_time,
'report_interval': report_interval,
'new_service_down_time': new_service_down_time})
CONF.set_override('service_down_time', new_service_down_time)
def _get_manager(self):
"""Initialize a Manager object appropriate for this service.

6
cinder/tests/test_service.py
View File

@ -210,6 +210,12 @@ class TestWSGIService(test.TestCase):
self.assertNotEqual(0, test_service.port)
test_service.stop()
def test_service_with_min_down_time(self):
CONF.set_override('service_down_time', 10)
CONF.set_override('report_interval', 10)
service.WSGIService("test_service")
self.assertEqual(CONF.service_down_time, 25)
class TestLauncher(test.TestCase):