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

Merge pull request #1806 from citusdata/deadlock-spam 

Don't spam the log with deadlock messages
pull/1893/head
Marco Slot 2017-12-21 17:10:32 +03:00 committed by GitHub
parent 6862cd066e 377b31dcf7
commit fa134984c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,7 +63,6 @@ void _PG_init(void);
static void multi_log_hook(ErrorData *edata); static void multi_log_hook(ErrorData *edata);
static void CreateRequiredDirectories(void); static void CreateRequiredDirectories(void);
static void RegisterCitusConfigVariables(void); static void RegisterCitusConfigVariables(void);
static void WarningForEnableDeadlockPrevention(bool newval, void *extra);
static bool ErrorIfNotASuitableDeadlockFactor(double *newval, void **extra, static bool ErrorIfNotASuitableDeadlockFactor(double *newval, void **extra,
GucSource source); GucSource source);
static void NormalizeWorkerListPath(void); static void NormalizeWorkerListPath(void);
@ -487,7 +486,7 @@ RegisterCitusConfigVariables(void)
true, true,
PGC_USERSET, PGC_USERSET,
GUC_NO_SHOW_ALL, GUC_NO_SHOW_ALL,
NULL, WarningForEnableDeadlockPrevention, NULL); NULL, NULL, NULL);
DefineCustomBoolVariable( DefineCustomBoolVariable(
"citus.enable_ddl_propagation", "citus.enable_ddl_propagation",
@ -922,18 +921,6 @@ RegisterCitusConfigVariables(void)
} }
/*
* Inform the users about the deprecated flag.
*/
static void
WarningForEnableDeadlockPrevention(bool newval, void *extra)
{
ereport(WARNING, (errcode(ERRCODE_WARNING_DEPRECATED_FEATURE),
errmsg("citus.enable_deadlock_prevention is deprecated and it has "
"no effect. The flag will be removed in the next release.")));
}
/* /*
* We don't want to allow values less than 1.0. However, we define -1 as the value to disable * We don't want to allow values less than 1.0. However, we define -1 as the value to disable
* distributed deadlock checking. Here we enforce our special constraint. * distributed deadlock checking. Here we enforce our special constraint.