openstack/deb-designate
Code Issues Proposed changes

Merge "Update PM pooling defaults"

Browse Source
This commit is contained in:
Jenkins 2015-04-21 15:59:25 +00:00 committed by Gerrit Code Review
commit 639e77f1ca
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
designate/pool_manager/__init__.py
View File

@ -32,13 +32,13 @@ OPTS = [
'for a domain change to be considered active'),
cfg.IntOpt('poll-timeout', default=30,
help='The time to wait for a response from a server'),
cfg.IntOpt('poll-retry-interval', default=2,
cfg.IntOpt('poll-retry-interval', default=15,
help='The time between retrying to send a request and '
'waiting for a response from a server'),
cfg.IntOpt('poll-max-retries', default=3,
cfg.IntOpt('poll-max-retries', default=10,
help='The maximum number of times to retry sending a request '
'and wait for a response from a server'),
cfg.IntOpt('poll-delay', default=1,
cfg.IntOpt('poll-delay', default=5,
help='The time to wait before sending the first request '
'to a server'),
cfg.BoolOpt('enable-recovery-timer', default=True,

16
designate/tests/test_pool_manager/test_service.py
View File

@ -136,16 +136,16 @@ class PoolManagerServiceNoopTest(PoolManagerTestCase):
self.assertEqual(2, mock_notify_zone_changed.call_count)
self.assertEqual(
[call(self.admin_context, domain,
self.service.pool.nameservers[0], 30, 2, 3, 0),
self.service.pool.nameservers[0], 30, 15, 10, 0),
call(self.admin_context, domain,
self.service.pool.nameservers[1], 30, 2, 3, 0)],
self.service.pool.nameservers[1], 30, 15, 10, 0)],
mock_notify_zone_changed.call_args_list)
self.assertEqual(2, mock_poll_for_serial_number.call_count)
self.assertEqual(
[call(self.admin_context, domain,
self.service.pool.nameservers[0], 30, 2, 3, 1),
self.service.pool.nameservers[0], 30, 15, 10, 5),
call(self.admin_context, domain,
self.service.pool.nameservers[1], 30, 2, 3, 1)],
self.service.pool.nameservers[1], 30, 15, 10, 5)],
mock_poll_for_serial_number.call_args_list)
# Pool manager needs to call into mdns to calculate consensus as
@ -236,16 +236,16 @@ class PoolManagerServiceNoopTest(PoolManagerTestCase):
self.assertEqual(2, mock_notify_zone_changed.call_count)
self.assertEqual(
[call(self.admin_context, domain,
self.service.pool.nameservers[0], 30, 2, 3, 0),
self.service.pool.nameservers[0], 30, 15, 10, 0),
call(self.admin_context, domain,
self.service.pool.nameservers[1], 30, 2, 3, 0)],
self.service.pool.nameservers[1], 30, 15, 10, 0)],
mock_notify_zone_changed.call_args_list)
self.assertEqual(2, mock_poll_for_serial_number.call_count)
self.assertEqual(
[call(self.admin_context, domain,
self.service.pool.nameservers[0], 30, 2, 3, 1),
self.service.pool.nameservers[0], 30, 15, 10, 5),
call(self.admin_context, domain,
self.service.pool.nameservers[1], 30, 2, 3, 1)],
self.service.pool.nameservers[1], 30, 15, 10, 5)],
mock_poll_for_serial_number.call_args_list)
self.assertEqual(False, mock_update_status.called)

6
etc/designate/designate.conf.sample
View File

@ -162,9 +162,9 @@ debug = False
#pool_id = 794ccc2c-d751-44fe-b57f-8894c9f5c842
#threshold_percentage = 100
#poll_timeout = 30
#poll_retry_interval = 2
#poll_max_retries = 3
#poll_delay = 1
#poll_retry_interval = 15
#poll_max_retries = 10
#poll_delay = 5
#periodic_recovery_interval = 120
#periodic_sync_interval = 1800
#periodic_sync_seconds = None