diff options
| author | Erik Olof Gunnar Andersson <eandersson@blizzard.com> | 2019-09-05 19:44:20 -0700 |
|---|---|---|
| committer | Erik Olof Gunnar Andersson <eandersson@blizzard.com> | 2019-09-05 21:21:38 -0700 |
| commit | 833f9c873d538037d6036624d19e5cba332cf54a (patch) | |
| tree | fbc749ca7306eafa2cf4178a48c37fb96479410e | |
| parent | e080b14422bcec68516067e90d66067a39817e03 (diff) | |
| download | designate-833f9c873d538037d6036624d19e5cba332cf54a.tar.gz | |
Adjusted default heartbeat interval and renamed file
The current default for heartbeats is a little aggressive,
adjusting the default value from 5s to 10s.
Also fixed the name of the conf file to make it clearer.
Change-Id: I3a699e9c83fab7851636867ef7399fa5fa9c3761
| -rw-r--r-- | designate/conf/__init__.py | 4 | ||||
| -rw-r--r-- | designate/conf/heartbeat_emitter.py (renamed from designate/conf/service_status.py) | 2 | ||||
| -rw-r--r-- | designate/tests/unit/test_service_status.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/designate/conf/__init__.py b/designate/conf/__init__.py index 5c402980..439c0ddc 100644 --- a/designate/conf/__init__.py +++ b/designate/conf/__init__.py @@ -24,6 +24,7 @@ from designate.conf import denominator from designate.conf import djbdns from designate.conf import dynect from designate.conf import gdnsd +from designate.conf import heartbeat_emitter from designate.conf import infoblox from designate.conf import keystone from designate.conf import knot2 @@ -34,7 +35,6 @@ from designate.conf import network_api from designate.conf import pool_manager from designate.conf import producer from designate.conf import proxy -from designate.conf import service_status from designate.conf import sink from designate.conf import storage from designate.conf import worker @@ -52,6 +52,7 @@ denominator.register_opts(CONF) djbdns.register_opts(CONF) dynect.register_opts(CONF) gdnsd.register_opts(CONF) +heartbeat_emitter.register_opts(CONF) infoblox.register_opts(CONF) keystone.register_opts(CONF) knot2.register_opts(CONF) @@ -62,7 +63,6 @@ network_api.register_opts(CONF) pool_manager.register_opts(CONF) producer.register_opts(CONF) proxy.register_opts(CONF) -service_status.register_opts(CONF) sink.register_opts(CONF) storage.register_opts(CONF) worker.register_opts(CONF) diff --git a/designate/conf/service_status.py b/designate/conf/heartbeat_emitter.py index d43afec6..1d9f4e57 100644 --- a/designate/conf/service_status.py +++ b/designate/conf/heartbeat_emitter.py @@ -20,7 +20,7 @@ HEARTBEAT_GROUP = cfg.OptGroup( HEARTBEAT_OPTS = [ cfg.FloatOpt('heartbeat_interval', - default=5.0, + default=10.0, help='Number of seconds between heartbeats for reporting ' 'state'), cfg.StrOpt('emitter_type', default="rpc", help="Emitter to use"), diff --git a/designate/tests/unit/test_service_status.py b/designate/tests/unit/test_service_status.py index 6ad43942..a8fe3880 100644 --- a/designate/tests/unit/test_service_status.py +++ b/designate/tests/unit/test_service_status.py @@ -32,7 +32,7 @@ class NoopEmitterTest(oslotest.base.BaseTestCase): emitter.start() self.mock_tg.add_timer.assert_called_once_with( - 5.0, emitter._emit_heartbeat) + 10.0, emitter._emit_heartbeat) def test_stop(self): mock_pulse = mock.Mock() |