openstack
/
designate
Code Issues Proposed changes

DevStack: Reduce periodic intervals in the gate 

Additional, increase the Tempest test timeout to double the sync
interval, to ensure it has a chance to run.

We do this to ensure a periodic sync is issued at least once
within the tempest timeouts, in order to work around an apparent
kernel bug in the netfilter module[1].

[1]: https://deepthought.isc.org/article/AA-01213/0/What-causes-refresh%3A-failure-trying-master-...%3A-operation-canceled-error-messages.html

Change-Id: I369f9913e4d2df2cd9e9f21ae26810194f5518dc
This commit is contained in:
Kiall Mac Innes 2015-04-09 16:55:24 +01:00 committed by Kiall Mac Innes
parent 8e7dd6228d
commit 43e65f9efb
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/devstack/gate_hook.sh
View File

@ -11,6 +11,8 @@ export ENABLED_SERVICES=designate,designate-api,designate-central,designate-sink
echo "DESIGNATE_SERVICE_PORT_DNS=5322" >> $BASE/new/devstack/localrc
echo "DESIGNATE_BACKEND_DRIVER=$DEVSTACK_GATE_DESIGNATE_DRIVER" >> $BASE/new/devstack/localrc
echo "DESIGNATE_PERIODIC_RECOVERY_INTERVAL=20" >> $BASE/new/devstack/localrc
echo "DESIGNATE_PERIODIC_SYNC_INTERVAL=20" >> $BASE/new/devstack/localrc
# Pass through any DESIGNATE_ env vars to the localrc file
env | grep -E "^DESIGNATE_" >> $BASE/new/devstack/localrc || :

4
contrib/devstack/lib/designate
View File

@ -48,6 +48,8 @@ DESIGNATE_TARGET_ID=${DESIGNATE_TARGET_ID:-f26e0b32-736f-4f0a-831b-039a415c481e}
DESIGNATE_DEFAULT_NS_RECORD=${DESIGNATE_DEFAULT_NS_RECORD:-ns1.devstack.org.}
DESIGNATE_NOTIFICATION_DRIVER=${DESIGNATE_NOTIFICATION_DRIVER:-}
DESIGNATE_NOTIFICATION_TOPICS=${DESIGNATE_NOTIFICATION_TOPICS:-notifications}
DESIGNATE_PERIODIC_RECOVERY_INTERVAL=${DESIGNATE_PERIODIC_RECOVERY_INTERVAL:-120}
DESIGNATE_PERIODIC_SYNC_INTERVAL=${DESIGNATE_PERIODIC_SYNC_INTERVAL:-1800}
# Public IP/Port Settings
DESIGNATE_SERVICE_PROTOCOL=${DESIGNATE_SERVICE_PROTOCOL:-$SERVICE_PROTOCOL}
@ -123,6 +125,8 @@ function configure_designate {
# Pool Manager Configuration
iniset $DESIGNATE_CONF service:pool_manager pool_id $DESIGNATE_POOL_ID
iniset $DESIGNATE_CONF service:pool_manager cache_driver $DESIGNATE_POOL_MANAGER_CACHE_DRIVER
iniset $DESIGNATE_CONF service:pool_manager periodic_recovery_interval $DESIGNATE_PERIODIC_RECOVERY_INTERVAL
iniset $DESIGNATE_CONF service:pool_manager periodic_sync_interval $DESIGNATE_PERIODIC_SYNC_INTERVAL
# Pool Manager Cache
if [ "$DESIGNATE_POOL_MANAGER_CACHE_DRIVER" == "sqlalchemy" ]; then

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

@ -165,7 +165,7 @@ debug = False
#poll_max_retries = 3
#poll_delay = 1
#periodic_recovery_interval = 120
#periodic_sync_interval = 300
#periodic_sync_interval = 1800
#periodic_sync_seconds = None
#cache_driver = sqlalchemy

2
functionaltests/common/base.py
View File

@ -27,7 +27,7 @@ class BaseDesignateTest(tempest_lib.base.BaseTestCase):
super(BaseDesignateTest, self).__init__(*args, **kwargs)
self.base_client = DesignateClient()
def wait_for_condition(self, condition, interval=1, timeout=20):
def wait_for_condition(self, condition, interval=1, timeout=40):
end_time = time.time() + timeout
while time.time() < end_time:
if condition():