diff options
author | Michael Paquier | 2012-06-05 12:38:42 +0000 |
---|---|---|
committer | Michael Paquier | 2012-06-05 12:38:42 +0000 |
commit | a868afadd0c3b19be26008c6f6725ee3285deebf (patch) | |
tree | 031006dc7766e93ad2928388c8535c6cab3388f4 | |
parent | dfee5379109a757e1bfaa9fe59830e6fb05f6688 (diff) |
Change mode choice option from -S to -Z
Documentation was referring to both, as well as initgtm.
The option to be used should be -Z to be consistent with pg_ctl
when choosing Coordinator or Datanode.
-rw-r--r-- | doc-xc/src/sgml/ref/gtm_ctl.sgmlin | 10 | ||||
-rw-r--r-- | src/gtm/gtm_ctl/gtm_ctl.c | 40 | ||||
-rw-r--r-- | src/gtm/test/promote.sh | 2 | ||||
-rw-r--r-- | src/gtm/test/start_a.sh | 4 | ||||
-rw-r--r-- | src/gtm/test/start_s.sh | 4 | ||||
-rw-r--r-- | src/gtm/test/stop.sh | 4 | ||||
-rw-r--r-- | src/gtm/test2/status_a.sh | 2 | ||||
-rw-r--r-- | src/gtm/test2/status_s.sh | 2 | ||||
-rw-r--r-- | src/test/regress/pg_regress.c | 2 |
9 files changed, 35 insertions, 35 deletions
diff --git a/doc-xc/src/sgml/ref/gtm_ctl.sgmlin b/doc-xc/src/sgml/ref/gtm_ctl.sgmlin index 84fd987676..2c77f4d31f 100644 --- a/doc-xc/src/sgml/ref/gtm_ctl.sgmlin +++ b/doc-xc/src/sgml/ref/gtm_ctl.sgmlin @@ -205,35 +205,35 @@ PostgreSQL documentation <para> Typically, you can issue the following command to start <command>gtm</command>/ <programlisting> -gtm_ctl start -S gtm -D datafolder +gtm_ctl start -Z gtm -D datafolder </programlisting> </para> <para> Or <command>gtm_proxy</command>: <programlisting> -gtm_ctl start -S gtm_proxy -D datafolder_proxy +gtm_ctl start -Z gtm_proxy -D datafolder_proxy </programlisting> </para> <para> Promote a GTM as active: <programlisting> -gtm_ctl promote -S gtm -D datafolder +gtm_ctl promote -Z gtm -D datafolder </programlisting> </para> <para> Reconnect a GTM proxy to another GTM instance: <programlisting> -gtm_ctl reconnect -S gtm_proxy -D datafolder_proxy -o '-s hostname -t port_number' +gtm_ctl reconnect -Z gtm_proxy -D datafolder_proxy -o '-s hostname -t port_number' </programlisting> </para> <para> Look at the status of a GTM server: <programlisting> -gtm_ctl status -S gtm -D datafolder +gtm_ctl status -Z gtm -D datafolder </programlisting> </para> </refsect1> diff --git a/src/gtm/gtm_ctl/gtm_ctl.c b/src/gtm/gtm_ctl/gtm_ctl.c index 8806a68303..e3f345dbcc 100644 --- a/src/gtm/gtm_ctl/gtm_ctl.c +++ b/src/gtm/gtm_ctl/gtm_ctl.c @@ -868,13 +868,13 @@ do_help(void) printf(_("%s is a utility to start, stop or restart,\n" "a GTM server, a GTM standby or GTM proxy.\n\n"), progname); printf(_("Usage:\n")); - printf(_(" %s start -S STARTUP_MODE [-w] [-t SECS] [-D DATADIR] [-l FILENAME] [-o \"OPTIONS\"]\n"), progname); - printf(_(" %s stop -S STARTUP_MODE [-W] [-t SECS] [-D DATADIR] [-m SHUTDOWN-MODE]\n"), progname); - printf(_(" %s promote -S STARTUP_MODE [-w] [-t SECS] [-D DATADIR]\n"), progname); - printf(_(" %s restart -S STARTUP_MODE [-w] [-t SECS] [-D DATADIR] [-m SHUTDOWN-MODE]\n" + printf(_(" %s start -Z STARTUP_MODE [-w] [-t SECS] [-D DATADIR] [-l FILENAME] [-o \"OPTIONS\"]\n"), progname); + printf(_(" %s stop -Z STARTUP_MODE [-W] [-t SECS] [-D DATADIR] [-m SHUTDOWN-MODE]\n"), progname); + printf(_(" %s promote -Z STARTUP_MODE [-w] [-t SECS] [-D DATADIR]\n"), progname); + printf(_(" %s restart -Z STARTUP_MODE [-w] [-t SECS] [-D DATADIR] [-m SHUTDOWN-MODE]\n" " [-o \"OPTIONS\"]\n"), progname); - printf(_(" %s status -S STARTUP_MODE [-w] [-t SECS] [-D DATADIR]\n"), progname); - printf(_(" %s reconnect -S STARTUP_MODE [-D DATADIR] -o \"OPTIONS\"]\n"), progname); + printf(_(" %s status -Z STARTUP_MODE [-w] [-t SECS] [-D DATADIR]\n"), progname); + printf(_(" %s reconnect -Z STARTUP_MODE [-D DATADIR] -o \"OPTIONS\"]\n"), progname); printf(_("\nCommon options:\n")); printf(_(" -D DATADIR location of the database storage area\n")); @@ -887,11 +887,11 @@ do_help(void) printf(_("(The default is to wait for shutdown, but not for start or restart.)\n\n")); printf(_("\nOptions for start or restart:\n")); - printf(_(" -S STARTUP-MODE can be \"gtm\", \"gtm_standby\" or \"gtm_proxy\"\n")); printf(_(" -l FILENAME write (or append) server log to FILENAME\n")); printf(_(" -o OPTIONS command line options to pass to gtm\n" " (GTM server executable)\n")); printf(_(" -p PATH-TO-GTM/PROXY path to gtm/gtm_proxy executables\n")); + printf(_(" -Z STARTUP-MODE can be \"gtm\", \"gtm_standby\" or \"gtm_proxy\"\n")); printf(_("\nOptions for stop or restart:\n")); printf(_(" -m SHUTDOWN-MODE can be \"smart\", \"fast\", or \"immediate\"\n")); @@ -983,7 +983,7 @@ main(int argc, char **argv) /* process command-line options */ while (optind < argc) { - while ((c = getopt(argc, argv, "D:i:l:m:o:p:S:t:wW")) != -1) + while ((c = getopt(argc, argv, "D:i:l:m:o:p:t:wWZ:")) != -1) { switch (c) { @@ -1025,17 +1025,6 @@ main(int argc, char **argv) gtm_path = xstrdup(optarg); canonicalize_path(gtm_path); break; - case 'S': - gtm_app = xstrdup(optarg); - if (strcmp(gtm_app,"gtm_proxy") != 0 - && strcmp(gtm_app,"gtm_standby") != 0 - && strcmp(gtm_app,"gtm") != 0) - { - write_stderr(_("%s: %s launch name set not correct\n"), progname, gtm_app); - do_advice(); - exit(1); - } - break; case 't': wait_seconds = atoi(optarg); break; @@ -1047,6 +1036,17 @@ main(int argc, char **argv) do_wait = false; wait_set = true; break; + case 'Z': + gtm_app = xstrdup(optarg); + if (strcmp(gtm_app,"gtm_proxy") != 0 + && strcmp(gtm_app,"gtm_standby") != 0 + && strcmp(gtm_app,"gtm") != 0) + { + write_stderr(_("%s: %s launch name set not correct\n"), progname, gtm_app); + do_advice(); + exit(1); + } + break; default: /* getopt_long already issued a suitable error message */ do_advice(); @@ -1112,7 +1112,7 @@ main(int argc, char **argv) /* * pid files of gtm and gtm proxy are named differently - * -S option has also to be set for STOP_COMMAND + * -Z option has also to be set for STOP_COMMAND * or gtm_ctl will not be able to find the correct pid_file */ if (!gtm_app) diff --git a/src/gtm/test/promote.sh b/src/gtm/test/promote.sh index ae60e9ccb3..75e0458ad9 100644 --- a/src/gtm/test/promote.sh +++ b/src/gtm/test/promote.sh @@ -12,7 +12,7 @@ export PATH=/tmp/pgxc/bin:$PATH echo "promoting standby..." export DATA=/tmp/pgxc/data/gtm_standby -gtm_ctl -D ${DATA} -S gtm_standby promote +gtm_ctl -D ${DATA} -Z gtm_standby promote # ------------------------------- # process check diff --git a/src/gtm/test/start_a.sh b/src/gtm/test/start_a.sh index 4a6c1c16fa..571e04b4f6 100644 --- a/src/gtm/test/start_a.sh +++ b/src/gtm/test/start_a.sh @@ -12,10 +12,10 @@ export DATA=/tmp/pgxc/data/gtm # ------------------------------- echo "starting active..." -gtm_ctl -D ${DATA} -S gtm stop +gtm_ctl -D ${DATA} -Z gtm stop rm -rf ${DATA}/gtm.opts ${DATA}/gtm.pid ${DATA}/register.node -gtm_ctl -D ${DATA} -S gtm -o "-n 101" start +gtm_ctl -D ${DATA} -Z gtm -o "-n 101" start # ------------------------------- # process check diff --git a/src/gtm/test/start_s.sh b/src/gtm/test/start_s.sh index b016bcee32..d9b458f255 100644 --- a/src/gtm/test/start_s.sh +++ b/src/gtm/test/start_s.sh @@ -13,10 +13,10 @@ echo "starting standby..." export DATA=/tmp/pgxc/data/gtm_standby -gtm_ctl -D ${DATA} -S gtm stop +gtm_ctl -D ${DATA} -Z gtm stop rm -rf ${DATA}/gtm.opts ${DATA}/gtm.pid ${DATA}/register.node -gtm_ctl -D ${DATA} -S gtm_standby -o "-n 102 -s -p 6667 -i 127.0.0.1 -q 6666" start +gtm_ctl -D ${DATA} -Z gtm_standby -o "-n 102 -s -p 6667 -i 127.0.0.1 -q 6666" start # ------------------------------- # process check diff --git a/src/gtm/test/stop.sh b/src/gtm/test/stop.sh index 4660ecc725..44efd7241d 100644 --- a/src/gtm/test/stop.sh +++ b/src/gtm/test/stop.sh @@ -12,7 +12,7 @@ export PATH=/tmp/pgxc/bin:$PATH echo "stopping standby..." export DATA=/tmp/pgxc/data/gtm_standby -gtm_ctl -D ${DATA} -S gtm stop +gtm_ctl -D ${DATA} -Z gtm stop # ------------------------------- # starting active... @@ -20,7 +20,7 @@ gtm_ctl -D ${DATA} -S gtm stop echo "stopping active..." export DATA=/tmp/pgxc/data/gtm -gtm_ctl -D ${DATA} -S gtm stop +gtm_ctl -D ${DATA} -Z gtm stop killall -9 gtm gtm_standby diff --git a/src/gtm/test2/status_a.sh b/src/gtm/test2/status_a.sh index d120fd0b7a..cdb17ca17d 100644 --- a/src/gtm/test2/status_a.sh +++ b/src/gtm/test2/status_a.sh @@ -8,5 +8,5 @@ export DATA=/tmp/pgxc/data/gtm # ------------------------------- # starting active... # ------------------------------- -gtm_ctl -D ${DATA} -S gtm status +gtm_ctl -D ${DATA} -Z gtm status diff --git a/src/gtm/test2/status_s.sh b/src/gtm/test2/status_s.sh index badcf1590b..e4e2841b24 100644 --- a/src/gtm/test2/status_s.sh +++ b/src/gtm/test2/status_s.sh @@ -8,5 +8,5 @@ export DATA=/tmp/pgxc/data/gtm_standby # ------------------------------- # starting active... # ------------------------------- -gtm_ctl -D ${DATA} -S gtm_standby status +gtm_ctl -D ${DATA} -Z gtm_standby status diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c index e7c123c417..b1b19b5414 100644 --- a/src/test/regress/pg_regress.c +++ b/src/test/regress/pg_regress.c @@ -386,7 +386,7 @@ stop_gtm(void) fflush(stderr); snprintf(buf, sizeof(buf), - SYSTEMQUOTE "\"%s/gtm_ctl\" stop -S gtm -D \"%s/%s\" -m fast" SYSTEMQUOTE, + SYSTEMQUOTE "\"%s/gtm_ctl\" stop -Z gtm -D \"%s/%s\" -m fast" SYSTEMQUOTE, bindir, temp_install, data_folder); r = system(buf); if (r != 0) |