diff --git a/doc.ja/src/sgml/connection-settings.sgml b/doc.ja/src/sgml/connection-settings.sgml index 136e2d5..deb37b8 100644 --- a/doc.ja/src/sgml/connection-settings.sgml +++ b/doc.ja/src/sgml/connection-settings.sgml @@ -1617,7 +1617,7 @@ S2/N2: COMMIT; - ALWAYS_MASTER + ALWAYS_PRIMARY ストリーミングレプリケーションでのみ有効です。ストリーミングレプリケーションモードについてはをご覧ください。このフラグがバックエンドのどれかにセットされていると、Pgpool-IIはバックエンドにアクセスしてプライマリノードを探すのではなく、このフラグがセットされているノードをプライマリノードと見なします。 diff --git a/doc.ja/src/sgml/example-Aurora.sgml b/doc.ja/src/sgml/example-Aurora.sgml index 11142c7..cdf4de1 100644 --- a/doc.ja/src/sgml/example-Aurora.sgml +++ b/doc.ja/src/sgml/example-Aurora.sgml @@ -97,11 +97,11 @@ - 0ののALWAYS_MASTERをオンにします。 + 0ののALWAYS_PRIMARYをオンにします。 diff --git a/doc/src/sgml/connection-settings.sgml b/doc/src/sgml/connection-settings.sgml index b0630b7..c90a7e9 100644 --- a/doc/src/sgml/connection-settings.sgml +++ b/doc/src/sgml/connection-settings.sgml @@ -1174,7 +1174,7 @@ S2/N2: COMMIT; - ALWAYS_MASTER + ALWAYS_PRIMARY This is only useful in streaming replication mode. See about streaming replication mode. If this flag is set to @@ -1185,7 +1185,7 @@ S2/N2: COMMIT; flag is set as the primary node. This is useful for systems including Amazon Aurora for PostgreSQL Compatibility which has - fixed master server name. See + fixed primary server name. See for an example settings. diff --git a/doc/src/sgml/example-Aurora.sgml b/doc/src/sgml/example-Aurora.sgml index 004e995..4f3d52a 100644 --- a/doc/src/sgml/example-Aurora.sgml +++ b/doc/src/sgml/example-Aurora.sgml @@ -60,7 +60,7 @@ - Set ALWAYS_MASTER flag to + Set ALWAYS_PRIMARY flag to the for 0. diff --git a/src/config/pool_config.c b/src/config/pool_config.c index 433e66e..3b39392 100644 --- a/src/config/pool_config.c +++ b/src/config/pool_config.c @@ -2310,12 +2310,12 @@ char *pool_flag_to_str(unsigned short flag) else if (POOL_DISALLOW_TO_FAILOVER(flag)) snprintf(buf, sizeof(buf), "DISALLOW_TO_FAILOVER"); - if (POOL_ALWAYS_MASTER & flag) + if (POOL_ALWAYS_PRIMARY & flag) { if (*buf == '\0') - snprintf(buf, sizeof(buf), "ALWAYS_MASTER"); + snprintf(buf, sizeof(buf), "ALWAYS_PRIMARY"); else - snprintf(buf+strlen(buf), sizeof(buf), "|ALWAYS_MASTER"); + snprintf(buf+strlen(buf), sizeof(buf), "|ALWAYS_PRIMARY"); } return buf; diff --git a/src/config/pool_config.l b/src/config/pool_config.l index ea7a678..3556a89 100644 --- a/src/config/pool_config.l +++ b/src/config/pool_config.l @@ -579,12 +579,12 @@ char *pool_flag_to_str(unsigned short flag) else if (POOL_DISALLOW_TO_FAILOVER(flag)) snprintf(buf, sizeof(buf), "DISALLOW_TO_FAILOVER"); - if (POOL_ALWAYS_MASTER & flag) + if (POOL_ALWAYS_PRIMARY & flag) { if (*buf == '\0') - snprintf(buf, sizeof(buf), "ALWAYS_MASTER"); + snprintf(buf, sizeof(buf), "ALWAYS_PRIMARY"); else - snprintf(buf+strlen(buf), sizeof(buf), "|ALWAYS_MASTER"); + snprintf(buf+strlen(buf), sizeof(buf), "|ALWAYS_PRIMARY"); } return buf; diff --git a/src/config/pool_config_variables.c b/src/config/pool_config_variables.c index 8de5378..ddb0620 100644 --- a/src/config/pool_config_variables.c +++ b/src/config/pool_config_variables.c @@ -1673,7 +1673,7 @@ static struct config_string_array ConfigureNamesStringArray[] = CONFIG_VAR_TYPE_STRING_ARRAY, true, 0, MAX_NUM_BACKENDS }, NULL, - "", /* for ALWAYS_MASTER */ + "", /* for ALWAYS_PRIMARY */ EMPTY_CONFIG_STRING, BackendFlagsAssignFunc, NULL, BackendFlagsShowFunc, BackendSlotEmptyCheckFunc }, @@ -4120,9 +4120,9 @@ BackendFlagsAssignFunc(ConfigContext context, char *newval, int index, int eleve disallow_to_failover_is_specified = true; } - else if ((!strcmp(flags[i], "ALWAYS_MASTER"))) + else if ((!strcmp(flags[i], "ALWAYS_PRIMARY"))) { - flag |= POOL_ALWAYS_MASTER; + flag |= POOL_ALWAYS_PRIMARY; } else @@ -4293,12 +4293,12 @@ BackendFlagsShowFunc(int index) else if (POOL_DISALLOW_TO_FAILOVER(flag)) snprintf(buffer, sizeof(buffer), "DISALLOW_TO_FAILOVER"); - if (POOL_ALWAYS_MASTER & flag) + if (POOL_ALWAYS_PRIMARY & flag) { if (*buffer == '\0') - snprintf(buffer, sizeof(buffer), "ALWAYS_MASTER"); + snprintf(buffer, sizeof(buffer), "ALWAYS_PRIMARY"); else - snprintf(buffer+strlen(buffer), sizeof(buffer), "|ALWAYS_MASTER"); + snprintf(buffer+strlen(buffer), sizeof(buffer), "|ALWAYS_PRIMARY"); } return buffer; } diff --git a/src/include/pool_config.h b/src/include/pool_config.h index 43d8e7e..012b948 100644 --- a/src/include/pool_config.h +++ b/src/include/pool_config.h @@ -123,7 +123,7 @@ typedef enum CHECK_TEMP_TABLE_OPTION * Flags for backendN_flag */ #define POOL_FAILOVER (1 << 0) /* allow or disallow failover */ -#define POOL_ALWAYS_MASTER (1 << 1) /* this backend is always master */ +#define POOL_ALWAYS_PRIMARY (1 << 1) /* this backend is always primary */ #define POOL_DISALLOW_TO_FAILOVER(x) ((unsigned short)(x) & POOL_FAILOVER) #define POOL_ALLOW_TO_FAILOVER(x) (!(POOL_DISALLOW_TO_FAILOVER(x))) diff --git a/src/main/pgpool_main.c b/src/main/pgpool_main.c index 0831ad0..f15a00d 100644 --- a/src/main/pgpool_main.c +++ b/src/main/pgpool_main.c @@ -3096,15 +3096,15 @@ find_primary_node(void) } /* - * First check for "ALWAYS_MASTER" flags exists. If so, do not perform + * First check for "ALWAYS_PRIMARY" flags exists. If so, do not perform * actual primary node check and just returns the node id. */ for (i = 0; i < NUM_BACKENDS; i++) { - if (POOL_ALWAYS_MASTER & BACKEND_INFO(i).flag) + if (POOL_ALWAYS_PRIMARY & BACKEND_INFO(i).flag) { ereport(DEBUG1, - (errmsg("find_primary_node: ALWAYS_MASTER flag found. Returns node id: %d", i))); + (errmsg("find_primary_node: ALWAYS_PRIMARY flag found. Returns node id: %d", i))); return i; } } diff --git a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical index dae80cc..109d82e 100644 --- a/src/sample/pgpool.conf.sample-logical +++ b/src/sample/pgpool.conf.sample-logical @@ -84,7 +84,7 @@ backend_data_directory0 = '/data' backend_flag0 = 'ALLOW_TO_FAILOVER' # Controls various backend behavior # ALLOW_TO_FAILOVER, DISALLOW_TO_FAILOVER - # or ALWAYS_MASTER + # or ALWAYS_PRIMARY backend_application_name0 = 'server0' # walsender's application_name, used for "show pool_nodes" command #backend_hostname1 = 'host2' diff --git a/src/sample/pgpool.conf.sample-raw b/src/sample/pgpool.conf.sample-raw index 62b0f2b..f2ff6d7 100644 --- a/src/sample/pgpool.conf.sample-raw +++ b/src/sample/pgpool.conf.sample-raw @@ -85,7 +85,7 @@ backend_data_directory0 = '/data' backend_flag0 = 'ALLOW_TO_FAILOVER' # Controls various backend behavior # ALLOW_TO_FAILOVER, DISALLOW_TO_FAILOVER - # or ALWAYS_MASTER + # or ALWAYS_PRIMARY backend_application_name0 = 'server0' # walsender's application_name, used for "show pool_nodes" command #backend_hostname1 = 'host2' diff --git a/src/sample/pgpool.conf.sample-slony b/src/sample/pgpool.conf.sample-slony index 9baf492..b9036ba 100644 --- a/src/sample/pgpool.conf.sample-slony +++ b/src/sample/pgpool.conf.sample-slony @@ -84,7 +84,7 @@ backend_data_directory0 = '/data' backend_flag0 = 'ALLOW_TO_FAILOVER' # Controls various backend behavior # ALLOW_TO_FAILOVER, DISALLOW_TO_FAILOVER - # or ALWAYS_MASTER + # or ALWAYS_PRIMARY #backend_hostname1 = 'host2' #backend_port1 = 5433 #backend_weight1 = 1 diff --git a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream index 52c6c0c..7374b4c 100644 --- a/src/sample/pgpool.conf.sample-stream +++ b/src/sample/pgpool.conf.sample-stream @@ -85,7 +85,7 @@ backend_data_directory0 = '/data' backend_flag0 = 'ALLOW_TO_FAILOVER' # Controls various backend behavior # ALLOW_TO_FAILOVER, DISALLOW_TO_FAILOVER - # or ALWAYS_MASTER + # or ALWAYS_PRIMARY backend_application_name0 = 'server0' # walsender's application_name, used for "show pool_nodes" command #backend_hostname1 = 'host2' diff --git a/src/test/pgpool_setup.in b/src/test/pgpool_setup.in index e59e132..2d64aa1 100644 --- a/src/test/pgpool_setup.in +++ b/src/test/pgpool_setup.in @@ -1117,7 +1117,7 @@ EOF if [ $n -eq 0 -a $MODE = "l" ] then - echo "backend_flag$n = ALWAYS_MASTER" >> $CONF + echo "backend_flag$n = ALWAYS_PRIMARY" >> $CONF fi CLUSTER="data"`expr $n`