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

citus_inden

preventConflictingFlags
Onder Kalaci 2020-04-01 12:06:10 +02:00
parent cf32de7620
commit 7f578c9c68
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/distributed/connection/shared_connection_stats.c
View File

@ -401,10 +401,12 @@ WakeupWaiterBackendsForSharedConnection(void)
ConditionVariableBroadcast(&ConnectionStatsSharedState->waitersConditionVariable); ConditionVariableBroadcast(&ConnectionStatsSharedState->waitersConditionVariable);
} }
void void
WaitForSharedConnection(void) WaitForSharedConnection(void)
{ {
ConditionVariableSleep(&ConnectionStatsSharedState->waitersConditionVariable, PG_WAIT_EXTENSION); ConditionVariableSleep(&ConnectionStatsSharedState->waitersConditionVariable,
PG_WAIT_EXTENSION);
} }

1
src/backend/distributed/shared_library_init.c
View File

@ -1595,4 +1595,3 @@ StatisticsCollectionGucCheckHook(bool *newval, void **extra, GucSource source)
} }
#endif #endif
} }

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

@ -348,8 +348,6 @@ BEGIN;
COMMIT; COMMIT;
-- connection_retry_timeout cannot be smaller than node_connection_timeout -- connection_retry_timeout cannot be smaller than node_connection_timeout
SET citus.connection_retry_timeout TO 1000; SET citus.connection_retry_timeout TO 1000;
ERROR: invalid value for parameter "citus.connection_retry_timeout": 1000
DETAIL: citus.connection_retry_timeout cannot be smaller than citus.node_connection_timeout.
-- 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;