Merge "Change initial delay for servicegroup api reporting"

This commit is contained in:
Jenkins
2014-03-21 05:47:47 +00:00
committed by Gerrit Code Review
3 changed files with 5 additions and 2 deletions

View File

@@ -36,6 +36,9 @@ servicegroup_driver_opt = cfg.StrOpt('servicegroup_driver',
CONF = cfg.CONF
CONF.register_opt(servicegroup_driver_opt)
# NOTE(geekinutah): By default drivers wait 5 seconds before reporting
INITIAL_REPORTING_DELAY = 5
class API(object):

View File

@@ -49,7 +49,7 @@ class DbDriver(api.ServiceGroupDriver):
report_interval = service.report_interval
if report_interval:
service.tg.add_timer(report_interval, self._report_state,
report_interval, service)
api.INITIAL_REPORTING_DELAY, service)
def is_up(self, service_ref):
"""Moved from nova.utils

View File

@@ -60,7 +60,7 @@ class MemcachedDriver(api.ServiceGroupDriver):
report_interval = service.report_interval
if report_interval:
service.tg.add_timer(report_interval, self._report_state,
report_interval, service)
api.INITIAL_REPORTING_DELAY, service)
def is_up(self, service_ref):
"""Moved from nova.utils