Standardize terminology on "primary" (in place of "master")

This commit is contained in:
Ian Barwick
2017-10-24 13:42:50 +09:00
parent a39b8ccc2d
commit 7c3abe28b9
6 changed files with 7 additions and 7 deletions

View File

@@ -205,7 +205,7 @@
</para> </para>
<para> <para>
Note that after registering a delayed standby, <application>repmgrd</application> will only start Note that after registering a delayed standby, <application>repmgrd</application> will only start
once the metadata added in the master node has been replicated. once the metadata added in the primary node has been replicated.
</para> </para>
</sect2> </sect2>
@@ -218,7 +218,7 @@
</sect2> </sect2>
<sect2 id="faq-repmgrd-recloned-no-start" xreflabel="repmgrd not restarting after node cloned"> <sect2 id="faq-repmgrd-recloned-no-start" xreflabel="repmgrd not restarting after node cloned">
<title>I've recloned a failed master as a standby, but <application>repmgrd</application> refuses to start?</title> <title>I've recloned a failed primary as a standby, but <application>repmgrd</application> refuses to start?</title>
<para> <para>
Check you registered the standby after recloning. If unregistered, the standby Check you registered the standby after recloning. If unregistered, the standby
cannot be considered as a promotion candidate even if <varname>failover</varname> is set to cannot be considered as a promotion candidate even if <varname>failover</varname> is set to

View File

@@ -19,7 +19,7 @@
If the standby is not running, the command can be executed on another If the standby is not running, the command can be executed on another
node by providing the id of the node to be unregistered using node by providing the id of the node to be unregistered using
the command line parameter <literal>--node-id</literal>, e.g. executing the following the command line parameter <literal>--node-id</literal>, e.g. executing the following
command on the master server will unregister the standby with command on the primary server will unregister the standby with
id <literal>3</literal>: id <literal>3</literal>:
<programlisting> <programlisting>
repmgr standby unregister -f /etc/repmgr.conf --node-id=3 repmgr standby unregister -f /etc/repmgr.conf --node-id=3

View File

@@ -28,7 +28,7 @@
/* /*
* do_bdr_register() * do_bdr_register()
* *
* As each BDR node is its own master, registering a BDR node * As each BDR node is its own primary, registering a BDR node
* will create the repmgr metadata schema if necessary. * will create the repmgr metadata schema if necessary.
*/ */
void void

View File

@@ -1323,7 +1323,7 @@ do_cluster_cleanup(void)
conn = establish_db_connection(config_file_options.conninfo, true); conn = establish_db_connection(config_file_options.conninfo, true);
/* check if there is a master in this cluster */ /* check if there is a primary in this cluster */
log_info(_("connecting to primary server")); log_info(_("connecting to primary server"));
primary_conn = establish_primary_db_connection(conn, true); primary_conn = establish_primary_db_connection(conn, true);

View File

@@ -925,7 +925,7 @@ main(int argc, char **argv)
runtime_options.terse, runtime_options.terse,
&config_file_options, &config_file_options,
argv[0]); argv[0]);
exit(SUCCESS);
check_cli_parameters(action); check_cli_parameters(action);
/* /*

View File

@@ -111,7 +111,7 @@
# By default, all notifications will be passed; the notification types # By default, all notifications will be passed; the notification types
# can be filtered to explicitly named ones, e.g.: # can be filtered to explicitly named ones, e.g.:
# #
# event_notifications=master_register,standby_register # event_notifications=primary_register,standby_register
#event_notification_command='' # An external program or script which #event_notification_command='' # An external program or script which
# can be executed by the user under which # can be executed by the user under which