Teach pgxc_ctl to use the new --waldir option of pg_basebackup

PG 10 replaced --xlogdir with --waldir, but we forgot to update pgxc_ctl to use
the new syntax. This patch fixes that oversight.

Per report and analysis by Virendra Kumar and patch by Mark Wong.

diff --git a/contrib/pgxc_ctl/datanode_cmd.c b/contrib/pgxc_ctl/datanode_cmd.c
index ee048d9711cd2e60f62a6ac05ef28dab3e5276eb..4e7ecc9b72512c2e647b94f168b1c9f33ee90f9f 100644 (file)
--- a/contrib/pgxc_ctl/datanode_cmd.c
+++ b/contrib/pgxc_ctl/datanode_cmd.c
@@ -1487,7 +1487,7 @@ int add_datanodeSlave(char *name, char *host, int port, int pooler, char *dir,
        doImmediate(host, NULL, "pg_basebackup -p %s -h %s -D %s -X stream %s %s",
                                aval(VAR_datanodePorts)[idx],
                                aval(VAR_datanodeMasterServers)[idx], dir,
-                               wal ? "--xlogdir" : "",
+                               wal ? "--waldir" : "",
                                wal ? walDir : "");
        /* Update the slave configuration with hot standby and port */
        if ((f = pgxc_popen_w(host, "cat >> %s/postgresql.conf", dir)) == NULL)

diff --git a/contrib/pgxc_ctl/do_command.c b/contrib/pgxc_ctl/do_command.c
index 916b024253d80bcbb97c70a910f589e763ca0142..6fed22c0cf35a2001f71736ec55a76d1850594da 100644 (file)
--- a/contrib/pgxc_ctl/do_command.c
+++ b/contrib/pgxc_ctl/do_command.c
@@ -2680,8 +2680,8 @@ do_show_help(char *line)
                                "add gtm_proxy name host port dir\n"
                                "add coordinator master name host port pooler dir extra_conf extra_pghba\n"
                                "add coordinator slave name host port pooler dir archDir\n"
-                               "add datanode master name host port pooler dir xlogdir restore_datanode_name extra_conf extra_pghba\n"
-                               "add datanode slave name host port pooler dir xlogdir archDir\n"
+                               "add datanode master name host port pooler dir waldir restore_datanode_name extra_conf extra_pghba\n"
+                               "add datanode slave name host port pooler dir waldir archDir\n"
                                "\n"
                                "Add the specified node to your postgres-xl cluster:\n"
                                "For more details, please see the pgxc_ctl documentation\n"

diff --git a/doc/src/sgml/pgxc_ctl-ref.sgml b/doc/src/sgml/pgxc_ctl-ref.sgml
index 483a55911fedcfe1d8100fde4f032736b8a857db..46b0439e6025800b8c96ad3aec8a237aaec10cdf 100644 (file)
--- a/doc/src/sgml/pgxc_ctl-ref.sgml
+++ b/doc/src/sgml/pgxc_ctl-ref.sgml
@@ -1626,8 +1626,8 @@ PGXC$ prepare config minimal my_minimal_config.conf
     <term><literal>add gtm_proxy <replaceable class="parameter">name</replaceable> <replaceable class="parameter">host</replaceable> <replaceable class="parameter">port</replaceable> <replaceable class="parameter">dir</replaceable></literal></term>
     <term><literal>add coordinator master <replaceable class="parameter">name</replaceable> <replaceable class="parameter">host</replaceable> <replaceable class="parameter">port</replaceable> <replaceable class="parameter">pooler</replaceable> <replaceable class="parameter">dir</replaceable>< <replaceable class="parameter">extraServerConf</replaceable> <replaceable class="parameter">extraPgHbaConf</replaceable></literal></term>
     <term><literal>add coordinator slave <replaceable class="parameter">name</replaceable> <replaceable class="parameter">host</replaceable> <replaceable class="parameter">port</replaceable> <replaceable class="parameter">pooler</replaceable> <replaceable class="parameter">dir</replaceable> <replaceable class="parameter">archDir</replaceable></literal></term>
-    <term><literal>add datanode master <replaceable class="parameter">name</replaceable> <replaceable class="parameter">host</replaceable>  <replaceable class="parameter">port</replaceable> <replaceable class="parameter">pooler</replaceable>  <replaceable class="parameter">dir</replaceable> <replaceable class="parameter">xlogdir</replaceable>  <replaceable class="parameter">extraServerConf</replaceable> <replaceable class="parameter">extraPgHbaConf</replaceable></literal></term>
-    <term><literal>add datanode slave <replaceable class="parameter">name</replaceable> <replaceable class="parameter">host</replaceable>  <replaceable class="parameter">port</replaceable> <replaceable class="parameter">pooler</replaceable>  <replaceable class="parameter">dir</replaceable> <replaceable class="parameter">xlogdir</replaceable> <replaceable class="parameter">archDir</replaceable></literal></term>
+    <term><literal>add datanode master <replaceable class="parameter">name</replaceable> <replaceable class="parameter">host</replaceable>  <replaceable class="parameter">port</replaceable> <replaceable class="parameter">pooler</replaceable>  <replaceable class="parameter">dir</replaceable> <replaceable class="parameter">waldir</replaceable>  <replaceable class="parameter">extraServerConf</replaceable> <replaceable class="parameter">extraPgHbaConf</replaceable></literal></term>
+    <term><literal>add datanode slave <replaceable class="parameter">name</replaceable> <replaceable class="parameter">host</replaceable>  <replaceable class="parameter">port</replaceable> <replaceable class="parameter">pooler</replaceable>  <replaceable class="parameter">dir</replaceable> <replaceable class="parameter">waldir</replaceable> <replaceable class="parameter">archDir</replaceable></literal></term>
     <listitem>
      <para>
       Add the specified node to your Postgres-XL cluster.  Each node needs a