From dd778fd06e51a500001dd5172348474c5b6180a6 Mon Sep 17 00:00:00 2001 From: Suneet Saldanha Date: Wed, 18 Dec 2019 14:07:27 -0800 Subject: [PATCH] Fix flaky ITBasicAuthConfigurationTest This test was failing to authenticate using the admin credentials. These should be available by default in the metadata store. This indicates that the credentials are not successfully being syncd before the test is run. This change increases the number of retries to 20 so that the services are syncd before the test runs --- integration-tests/docker/broker.conf | 1 + integration-tests/docker/historical.conf | 1 + integration-tests/docker/middlemanager.conf | 1 + integration-tests/docker/overlord.conf | 3 ++- integration-tests/docker/router-custom-check-tls.conf | 3 ++- integration-tests/docker/router-no-client-auth-tls.conf | 1 + integration-tests/docker/router-permissive-tls.conf | 1 + integration-tests/docker/router.conf | 1 + 8 files changed, 10 insertions(+), 2 deletions(-) diff --git a/integration-tests/docker/broker.conf b/integration-tests/docker/broker.conf index f075558afcf2..aa4e83f2cdaf 100644 --- a/integration-tests/docker/broker.conf +++ b/integration-tests/docker/broker.conf @@ -26,6 +26,7 @@ command=java -Ddruid.auth.authenticator.basic.initialInternalClientPassword=warlock -Ddruid.auth.authenticator.basic.authorizerName=basic -Ddruid.auth.basic.common.cacheDirectory=/tmp/authCache/broker + -Ddruid.auth.basic.common.maxSyncRetries=20 -Ddruid.escalator.type=basic -Ddruid.escalator.internalClientUsername=druid_system -Ddruid.escalator.internalClientPassword=warlock diff --git a/integration-tests/docker/historical.conf b/integration-tests/docker/historical.conf index 964e75561431..04dcbf4c9501 100644 --- a/integration-tests/docker/historical.conf +++ b/integration-tests/docker/historical.conf @@ -24,6 +24,7 @@ command=java -Ddruid.auth.authenticator.basic.initialInternalClientPassword=warlock -Ddruid.auth.authenticator.basic.authorizerName=basic -Ddruid.auth.basic.common.cacheDirectory=/tmp/authCache/historical + -Ddruid.auth.basic.common.maxSyncRetries=20 -Ddruid.escalator.type=basic -Ddruid.escalator.internalClientUsername=druid_system -Ddruid.escalator.internalClientPassword=warlock diff --git a/integration-tests/docker/middlemanager.conf b/integration-tests/docker/middlemanager.conf index 35cfbb18c02d..d32e6b130bf5 100644 --- a/integration-tests/docker/middlemanager.conf +++ b/integration-tests/docker/middlemanager.conf @@ -28,6 +28,7 @@ command=java -Ddruid.auth.authenticator.basic.initialInternalClientPassword=warlock -Ddruid.auth.authenticator.basic.authorizerName=basic -Ddruid.auth.basic.common.cacheDirectory=/tmp/authCache/middleManager + -Ddruid.auth.basic.common.maxSyncRetries=20 -Ddruid.escalator.type=basic -Ddruid.escalator.internalClientUsername=druid_system -Ddruid.escalator.internalClientPassword=warlock diff --git a/integration-tests/docker/overlord.conf b/integration-tests/docker/overlord.conf index 5af40d6a8e75..405441cdb684 100644 --- a/integration-tests/docker/overlord.conf +++ b/integration-tests/docker/overlord.conf @@ -23,6 +23,7 @@ command=java -Ddruid.auth.authenticator.basic.initialInternalClientPassword=warlock -Ddruid.auth.authenticator.basic.authorizerName=basic -Ddruid.auth.basic.common.cacheDirectory=/tmp/authCache/overlord + -Ddruid.auth.basic.common.maxSyncRetries=20 -Ddruid.escalator.type=basic -Ddruid.escalator.internalClientUsername=druid_system -Ddruid.escalator.internalClientPassword=warlock @@ -56,4 +57,4 @@ redirect_stderr=true priority=100 autorestart=false stdout_logfile=/shared/logs/overlord.log -environment=AWS_REGION=us-east-1 \ No newline at end of file +environment=AWS_REGION=us-east-1 diff --git a/integration-tests/docker/router-custom-check-tls.conf b/integration-tests/docker/router-custom-check-tls.conf index 4ecaaebd75c4..c7862c6442d5 100644 --- a/integration-tests/docker/router-custom-check-tls.conf +++ b/integration-tests/docker/router-custom-check-tls.conf @@ -20,6 +20,7 @@ command=java -Ddruid.auth.authenticator.basic.initialInternalClientPassword=warlock -Ddruid.auth.authenticator.basic.authorizerName=basic -Ddruid.auth.basic.common.cacheDirectory=/tmp/authCache/router-custom-check-tls + -Ddruid.auth.basic.common.maxSyncRetries=20 -Ddruid.escalator.type=basic -Ddruid.escalator.internalClientUsername=druid_system -Ddruid.escalator.internalClientPassword=warlock @@ -54,4 +55,4 @@ command=java redirect_stderr=true priority=100 autorestart=false -stdout_logfile=/shared/logs/router-custom-check-tls.log \ No newline at end of file +stdout_logfile=/shared/logs/router-custom-check-tls.log diff --git a/integration-tests/docker/router-no-client-auth-tls.conf b/integration-tests/docker/router-no-client-auth-tls.conf index fb83b4819841..6e0eaf6ae135 100644 --- a/integration-tests/docker/router-no-client-auth-tls.conf +++ b/integration-tests/docker/router-no-client-auth-tls.conf @@ -19,6 +19,7 @@ command=java -Ddruid.auth.authenticator.basic.initialInternalClientPassword=warlock -Ddruid.auth.authenticator.basic.authorizerName=basic -Ddruid.auth.basic.common.cacheDirectory=/tmp/authCache/router-no-client-auth-tls + -Ddruid.auth.basic.common.maxSyncRetries=20 -Ddruid.escalator.type=basic -Ddruid.escalator.internalClientUsername=druid_system -Ddruid.escalator.internalClientPassword=warlock diff --git a/integration-tests/docker/router-permissive-tls.conf b/integration-tests/docker/router-permissive-tls.conf index 62932c7a942f..2d2fa6bea7ae 100644 --- a/integration-tests/docker/router-permissive-tls.conf +++ b/integration-tests/docker/router-permissive-tls.conf @@ -19,6 +19,7 @@ command=java -Ddruid.auth.authenticator.basic.initialInternalClientPassword=warlock -Ddruid.auth.authenticator.basic.authorizerName=basic -Ddruid.auth.basic.common.cacheDirectory=/tmp/authCache/router-permissive-tls + -Ddruid.auth.basic.common.maxSyncRetries=20 -Ddruid.escalator.type=basic -Ddruid.escalator.internalClientUsername=druid_system -Ddruid.escalator.internalClientPassword=warlock diff --git a/integration-tests/docker/router.conf b/integration-tests/docker/router.conf index 98a7a97222c0..092879b88fb7 100644 --- a/integration-tests/docker/router.conf +++ b/integration-tests/docker/router.conf @@ -15,6 +15,7 @@ command=java -Ddruid.auth.authenticator.basic.initialInternalClientPassword=warlock -Ddruid.auth.authenticator.basic.authorizerName=basic -Ddruid.auth.basic.common.cacheDirectory=/tmp/authCache/router + -Ddruid.auth.basic.common.maxSyncRetries=20 -Ddruid.escalator.type=basic -Ddruid.escalator.internalClientUsername=druid_system -Ddruid.escalator.internalClientPassword=warlock