external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove tracking old GUC

preventConflictingFlags
Onder Kalaci 2020-04-08 19:23:19 +02:00
parent 2325a6c68a
commit f93f85eadf
3 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/distributed/executor/adaptive_executor.c
View File

@ -2437,8 +2437,7 @@ ManageWorkerPool(WorkerPool *workerPool)
* The worker pool has just started to establish connections. We need to * The worker pool has just started to establish connections. We need to
* defer this initilization after StartNodeUserDatabaseConnection() * defer this initilization after StartNodeUserDatabaseConnection()
* because for non-optional connections, we have some logic to wait * because for non-optional connections, we have some logic to wait
* until a connection is allowed to be established for a duration of * until a connection is allowed to be established.
* citus.connection_retry_timeout.
*/ */
INSTR_TIME_SET_ZERO(workerPool->poolStartTime); INSTR_TIME_SET_ZERO(workerPool->poolStartTime);
} }

3
src/test/regress/expected/shared_connection_stats.out
View File

@ -209,7 +209,6 @@ SELECT pg_sleep(0.1);
BEGIN; BEGIN;
SET LOCAL citus.node_connection_timeout TO 1000; 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; SET LOCAL citus.force_max_query_parallelization TO ON;
SELECT count(*) FROM test; SELECT count(*) FROM test;
count count
@ -378,8 +377,6 @@ BEGIN;
(2 rows) (2 rows)
COMMIT; 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 -- in case other tests relies on these setting, reset them
ALTER SYSTEM RESET citus.distributed_deadlock_detection_factor; ALTER SYSTEM RESET citus.distributed_deadlock_detection_factor;
ALTER SYSTEM RESET citus.recover_2pc_interval; ALTER SYSTEM RESET citus.recover_2pc_interval;

7
src/test/regress/sql/shared_connection_stats.sql
View File

@ -125,7 +125,6 @@ SELECT pg_sleep(0.1);
BEGIN; BEGIN;
SET LOCAL citus.node_connection_timeout TO 1000; 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; SET LOCAL citus.force_max_query_parallelization TO ON;
SELECT count(*) FROM test; SELECT count(*) FROM test;
COMMIT; COMMIT;
@ -220,12 +219,6 @@ BEGIN;
hostname, port; hostname, port;
COMMIT; 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 -- in case other tests relies on these setting, reset them
ALTER SYSTEM RESET citus.distributed_deadlock_detection_factor; ALTER SYSTEM RESET citus.distributed_deadlock_detection_factor;
ALTER SYSTEM RESET citus.recover_2pc_interval; ALTER SYSTEM RESET citus.recover_2pc_interval;