From f93f85eadfeefadbc6d75dfd8d4ee367232b464d Mon Sep 17 00:00:00 2001 From: Onder Kalaci Date: Wed, 8 Apr 2020 19:23:19 +0200 Subject: [PATCH] Remove tracking old GUC --- src/backend/distributed/executor/adaptive_executor.c | 3 +-- src/test/regress/expected/shared_connection_stats.out | 3 --- src/test/regress/sql/shared_connection_stats.sql | 7 ------- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/src/backend/distributed/executor/adaptive_executor.c b/src/backend/distributed/executor/adaptive_executor.c index 3bf30e572..9e8b21ce3 100644 --- a/src/backend/distributed/executor/adaptive_executor.c +++ b/src/backend/distributed/executor/adaptive_executor.c @@ -2437,8 +2437,7 @@ ManageWorkerPool(WorkerPool *workerPool) * The worker pool has just started to establish connections. We need to * defer this initilization after StartNodeUserDatabaseConnection() * because for non-optional connections, we have some logic to wait - * until a connection is allowed to be established for a duration of - * citus.connection_retry_timeout. + * until a connection is allowed to be established. */ INSTR_TIME_SET_ZERO(workerPool->poolStartTime); } diff --git a/src/test/regress/expected/shared_connection_stats.out b/src/test/regress/expected/shared_connection_stats.out index 9adc1e062..229a00aff 100644 --- a/src/test/regress/expected/shared_connection_stats.out +++ b/src/test/regress/expected/shared_connection_stats.out @@ -209,7 +209,6 @@ SELECT pg_sleep(0.1); BEGIN; SET LOCAL citus.node_connection_timeout TO 1000; - SET LOCAL citus.connection_retry_timeout TO 2000; SET LOCAL citus.force_max_query_parallelization TO ON; SELECT count(*) FROM test; count @@ -378,8 +377,6 @@ BEGIN; (2 rows) COMMIT; --- connection_retry_timeout cannot be smaller than node_connection_timeout -SET citus.connection_retry_timeout TO 1000; -- in case other tests relies on these setting, reset them ALTER SYSTEM RESET citus.distributed_deadlock_detection_factor; ALTER SYSTEM RESET citus.recover_2pc_interval; diff --git a/src/test/regress/sql/shared_connection_stats.sql b/src/test/regress/sql/shared_connection_stats.sql index e0573f24d..8200e416d 100644 --- a/src/test/regress/sql/shared_connection_stats.sql +++ b/src/test/regress/sql/shared_connection_stats.sql @@ -125,7 +125,6 @@ SELECT pg_sleep(0.1); BEGIN; SET LOCAL citus.node_connection_timeout TO 1000; - SET LOCAL citus.connection_retry_timeout TO 2000; SET LOCAL citus.force_max_query_parallelization TO ON; SELECT count(*) FROM test; COMMIT; @@ -220,12 +219,6 @@ BEGIN; hostname, port; COMMIT; - - - --- connection_retry_timeout cannot be smaller than node_connection_timeout -SET citus.connection_retry_timeout TO 1000; - -- in case other tests relies on these setting, reset them ALTER SYSTEM RESET citus.distributed_deadlock_detection_factor; ALTER SYSTEM RESET citus.recover_2pc_interval;