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

Merge pull request #2243 from citusdata/better-guc-description 

Remove sslmode structs and add more helpful description
pull/2253/head
Marco Slot 2018-07-05 14:33:05 +02:00 committed by GitHub
parent 1bff1c2d3d 735218ee5d
commit 6656592b8e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,20 +77,7 @@ static bool StatisticsCollectionGucCheckHook(bool *newval, void **extra, GucSour
/* static variable to hold value of deprecated GUC variable */ /* static variable to hold value of deprecated GUC variable */
static bool ExpireCachedShards = false; static bool ExpireCachedShards = false;
static int LargeTableShardCount = 0; static int LargeTableShardCount = 0;
static int CitusSSLMode = 0;
/*
* SSL modes available for connecting to worker nodes.
*/
enum CitusSSLMode
{
CITUS_SSL_MODE_DISABLE = 1 << 0,
CITUS_SSL_MODE_ALLOW = 1 << 1,
CITUS_SSL_MODE_PREFER = 1 << 2,
CITUS_SSL_MODE_REQUIRE = 1 << 3,
CITUS_SSL_MODE_VERIFY_CA = 1 << 4,
CITUS_SSL_MODE_VERIFY_FULL = 1 << 5
};
static int CitusSSLMode = CITUS_SSL_MODE_PREFER;
/* *INDENT-OFF* */ /* *INDENT-OFF* */
/* GUC enum definitions */ /* GUC enum definitions */
@ -132,16 +119,6 @@ static const struct config_enum_entry multi_shard_commit_protocol_options[] = {
{ NULL, 0, false } { NULL, 0, false }
}; };
static const struct config_enum_entry citus_ssl_mode_options[] = {
{ "disable", CITUS_SSL_MODE_DISABLE, false },
{ "allow", CITUS_SSL_MODE_ALLOW, false },
{ "prefer", CITUS_SSL_MODE_PREFER, false },
{ "require", CITUS_SSL_MODE_REQUIRE, false },
{ "verify-ca", CITUS_SSL_MODE_VERIFY_CA, false },
{ "verify-full", CITUS_SSL_MODE_VERIFY_FULL, false },
{ NULL, 0, false }
};
static const struct config_enum_entry multi_task_query_log_level_options[] = { static const struct config_enum_entry multi_task_query_log_level_options[] = {
{ "off", MULTI_TASK_QUERY_INFO_OFF, false }, { "off", MULTI_TASK_QUERY_INFO_OFF, false },
{ "debug", DEBUG2, false }, { "debug", DEBUG2, false },
@ -347,13 +324,13 @@ RegisterCitusConfigVariables(void)
NULL, NULL, NULL); NULL, NULL, NULL);
NormalizeWorkerListPath(); NormalizeWorkerListPath();
DefineCustomEnumVariable( DefineCustomIntVariable(
"citus.sslmode", "citus.sslmode",
gettext_noop("This GUC variable has been deprecated."), gettext_noop("This variable has been deprecated. Use the citus.node_conninfo "
"GUC instead."),
NULL, NULL,
&CitusSSLMode, &CitusSSLMode,
CITUS_SSL_MODE_PREFER, 0, 0, 32,
citus_ssl_mode_options,
PGC_POSTMASTER, PGC_POSTMASTER,
GUC_SUPERUSER_ONLY | GUC_NO_SHOW_ALL, GUC_SUPERUSER_ONLY | GUC_NO_SHOW_ALL,
NULL, NULL, NULL); NULL, NULL, NULL);