diff --git a/nova/servicegroup/api.py b/nova/servicegroup/api.py index ce153312f0d8..f194db596256 100644 --- a/nova/servicegroup/api.py +++ b/nova/servicegroup/api.py @@ -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): diff --git a/nova/servicegroup/drivers/db.py b/nova/servicegroup/drivers/db.py index ab39cde29124..fc6d8a2e679d 100644 --- a/nova/servicegroup/drivers/db.py +++ b/nova/servicegroup/drivers/db.py @@ -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 diff --git a/nova/servicegroup/drivers/mc.py b/nova/servicegroup/drivers/mc.py index 1bc6e7a1df10..2a5821cb2c86 100644 --- a/nova/servicegroup/drivers/mc.py +++ b/nova/servicegroup/drivers/mc.py @@ -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