Suppress the message hinting to start coordinator/datanode/gtm server at the

end of initdb/initgtm when the commands are run via pgxc_ctl

This can be confusing to the user. We use an environment varibale
PGXC_CTL_SILENT to silence the message instead of adding a new option.

5 files changed, 55 insertions, 41 deletions

diff --git a/contrib/pgxc_ctl/coord_cmd.c b/contrib/pgxc_ctl/coord_cmd.c
index de4d622f6e..b612a02385 100644
--- a/contrib/pgxc_ctl/coord_cmd.c
+++ b/contrib/pgxc_ctl/coord_cmd.c
@@ -95,7 +95,7 @@ cmd_t *prepare_initCoordinatorMaster(char *nodeName)
 			 "%s;"
 			 "rm -rf %s;"
 			 "mkdir -p %s;"
-			 "initdb --nodename %s -D %s",
+			 "PGXC_CTL_SILENT=1 initdb --nodename %s -D %s",
 			 remoteDirCheck,
 			 aval(VAR_coordMasterDirs)[jj],
 			 aval(VAR_coordMasterDirs)[jj],
@@ -1095,7 +1095,7 @@ int add_coordinatorMaster(char *name, char *host, int port, int pooler,
 	gtmPort = (gtmPxyIdx > 0) ? aval(VAR_gtmProxyPorts)[gtmPxyIdx] : sval(VAR_gtmMasterPort);
 
 	/* initdb */
-	doImmediate(host, NULL, "initdb -D %s --nodename %s", dir, name);
+	doImmediate(host, NULL, "PGXC_CTL_SILENT=1 initdb -D %s --nodename %s", dir, name);
 
 	/* Edit configurations */
 	if ((f = pgxc_popen_w(host, "cat >> %s/postgresql.conf", dir)))
diff --git a/contrib/pgxc_ctl/datanode_cmd.c b/contrib/pgxc_ctl/datanode_cmd.c
index 9cfdbefd43..838f060c9b 100644
--- a/contrib/pgxc_ctl/datanode_cmd.c
+++ b/contrib/pgxc_ctl/datanode_cmd.c
@@ -103,7 +103,7 @@ cmd_t *prepare_initDatanodeMaster(char *nodeName)
 	snprintf(newCommand(cmdInitdb), MAXLINE,
 			 "%s;"
 			 "rm -rf %s;"
-			 "mkdir -p %s; initdb --nodename %s %s %s -D %s",
+			 "mkdir -p %s; PGXC_CTL_SILENT=1 initdb --nodename %s %s %s -D %s",
 			 remoteDirCheck,
 			 aval(VAR_datanodeMasterDirs)[idx], aval(VAR_datanodeMasterDirs)[idx],
 			 aval(VAR_datanodeNames)[idx],
@@ -1132,7 +1132,7 @@ int add_datanodeMaster(char *name, char *host, int port, int pooler, char *dir,
 	gtmPort = (gtmPxyIdx > 0) ? aval(VAR_gtmProxyPorts)[gtmPxyIdx] : sval(VAR_gtmMasterPort);
 
 	/* initdb */
-	doImmediate(host, NULL, "initdb -D %s %s %s --nodename %s", dir,
+	doImmediate(host, NULL, "PGXC_CTL_SILENT=1 initdb -D %s %s %s --nodename %s", dir,
 			wal ? "-X" : "",
 			wal ? waldir : "",
 			name);
diff --git a/contrib/pgxc_ctl/gtm_cmd.c b/contrib/pgxc_ctl/gtm_cmd.c
index 38ac3d84ae..3994bda73a 100644
--- a/contrib/pgxc_ctl/gtm_cmd.c
+++ b/contrib/pgxc_ctl/gtm_cmd.c
@@ -73,7 +73,7 @@ cmd_t *prepare_initGtmMaster(bool stop)
 			 "[ -f %s/gtm.pid ] && gtm_ctl -D %s -m immediate -Z gtm stop;"
 			 "rm -rf %s;"
 			 "mkdir -p %s;"
-			 "initgtm -Z gtm -D %s",
+			 "PGXC_CTL_SILENT=1 initgtm -Z gtm -D %s",
 			 remoteDirCheck,
 			 sval(VAR_gtmMasterDir),
 			 sval(VAR_gtmMasterDir),
@@ -416,7 +416,7 @@ cmd_t *prepare_initGtmSlave(void)
 			 "[ -f %s/gtm.pid ] && gtm_ctl -D %s -m immediate -Z gtm stop;"
 			 "rm -rf %s;"
 			 "mkdir -p %s;"
-			 "initgtm -Z gtm -D %s",
+			 "PGXC_CTL_SILENT=1 initgtm -Z gtm -D %s",
 			 sval(VAR_gtmSlaveDir),
 			 sval(VAR_gtmSlaveDir),
 			 sval(VAR_gtmSlaveDir), sval(VAR_gtmSlaveDir), sval(VAR_gtmSlaveDir));
@@ -1056,7 +1056,7 @@ cmd_t *prepare_initGtmProxy(char *nodeName)
 			 "[ -f %s/gtm_proxy.pid ] && gtm_ctl -D %s -m immediate -Z gtm_proxy stop;"
 			 "rm -rf %s;"
 			 "mkdir -p %s;"
-			 "initgtm -Z gtm_proxy -D %s",
+			 "PGXC_CTL_SILENT=1 initgtm -Z gtm_proxy -D %s",
 			 aval(VAR_gtmProxyDirs)[idx],
 			 aval(VAR_gtmProxyDirs)[idx],
 			 aval(VAR_gtmProxyDirs)[idx],
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 69c75611d6..2ab3cb5386 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -3784,22 +3784,29 @@ main(int argc, char *argv[])
 
 
 #ifdef PGXC
-	printf(_("\nSuccess.\n You can now start the database server of the Postgres-XL coordinator using:\n\n"
-			 "    %s%s%spostgres%s --coordinator -D %s%s%s\n"
-			 "or\n"
-			 "    %s%s%spg_ctl%s start -D %s%s%s -Z coordinator -l logfile\n\n"
-			 " You can now start the database server of the Postgres-XL datanode using:\n\n"
-			 "    %s%s%spostgres%s --datanode -D %s%s%s\n"
-			 "or \n"
-			 "    %s%s%spg_ctl%s start -D %s%s%s -Z datanode -l logfile\n\n"),
-	   QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
-		   QUOTE_PATH, pgdata_native, QUOTE_PATH,
-	   QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
-		   QUOTE_PATH, pgdata_native, QUOTE_PATH,
-	   QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
-		   QUOTE_PATH, pgdata_native, QUOTE_PATH,
-	   QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
-		   QUOTE_PATH, pgdata_native, QUOTE_PATH);
+	printf(_("\nSuccess.\n"));
+	{
+		char *pgxc_ctl_silent = getenv("PGXC_CTL_SILENT");
+		if (!pgxc_ctl_silent || !strlen(pgxc_ctl_silent))
+		{
+			printf(_("You can now start the database server of the Postgres-XL coordinator using:\n\n"
+						"    %s%s%spostgres%s --coordinator -D %s%s%s\n"
+						"or\n"
+						"    %s%s%spg_ctl%s start -D %s%s%s -Z coordinator -l logfile\n\n"
+						" You can now start the database server of the Postgres-XL datanode using:\n\n"
+						"    %s%s%spostgres%s --datanode -D %s%s%s\n"
+						"or \n"
+						"    %s%s%spg_ctl%s start -D %s%s%s -Z datanode -l logfile\n\n"),
+					QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
+					QUOTE_PATH, pgdata_native, QUOTE_PATH,
+					QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
+					QUOTE_PATH, pgdata_native, QUOTE_PATH,
+					QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
+					QUOTE_PATH, pgdata_native, QUOTE_PATH,
+					QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
+					QUOTE_PATH, pgdata_native, QUOTE_PATH);
+		}
+	}
 #else
 	printf(_("\nSuccess. You can now start the database server using:\n\n"
 			 "    %s%s%spg_ctl%s -D %s%s%s -l logfile start\n\n"),
diff --git a/src/bin/initgtm/initgtm.c b/src/bin/initgtm/initgtm.c
index 7e1d002e52..4e77b41c62 100644
--- a/src/bin/initgtm/initgtm.c
+++ b/src/bin/initgtm/initgtm.c
@@ -1114,24 +1114,31 @@ main(int argc, char *argv[])
 	strcpy(bin_dir, argv[0]);
 	get_parent_directory(bin_dir);
 
-	if (is_gtm)
-		printf(_("\nSuccess. You can now start the GTM server using:\n\n"
-				 "    %s%s%sgtm%s -D %s%s%s\n"
-				 "or\n"
-				 "    %s%s%sgtm_ctl%s -Z gtm -D %s%s%s -l logfile start\n\n"),
-		   QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
-			   QUOTE_PATH, pg_data_native, QUOTE_PATH,
-		   QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
-			   QUOTE_PATH, pg_data_native, QUOTE_PATH);
-	else
-		printf(_("\nSuccess. You can now start the GTM proxy server using:\n\n"
-				 "    %s%s%sgtm_proxy%s -D %s%s%s\n"
-				 "or\n"
-				 "    %s%s%sgtm_ctl%s -Z gtm_proxy -D %s%s%s -l logfile start\n\n"),
-		   QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
-			   QUOTE_PATH, pg_data_native, QUOTE_PATH,
-		   QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
-			   QUOTE_PATH, pg_data_native, QUOTE_PATH);
+	printf(_("\nSuccess.\n"));
+	{
+		char *pgxc_ctl_silent = getenv("PGXC_CTL_SILENT");
+		if (!pgxc_ctl_silent || !strlen(pgxc_ctl_silent))
+		{
+			if (is_gtm)
+				printf(_("You can now start the GTM server using:\n\n"
+							"    %s%s%sgtm%s -D %s%s%s\n"
+							"or\n"
+							"    %s%s%sgtm_ctl%s -Z gtm -D %s%s%s -l logfile start\n\n"),
+						QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
+						QUOTE_PATH, pg_data_native, QUOTE_PATH,
+						QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
+						QUOTE_PATH, pg_data_native, QUOTE_PATH);
+			else
+				printf(_("You can now start the GTM proxy server using:\n\n"
+							"    %s%s%sgtm_proxy%s -D %s%s%s\n"
+							"or\n"
+							"    %s%s%sgtm_ctl%s -Z gtm_proxy -D %s%s%s -l logfile start\n\n"),
+						QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
+						QUOTE_PATH, pg_data_native, QUOTE_PATH,
+						QUOTE_PATH, bin_dir, (strlen(bin_dir) > 0) ? DIR_SEP : "", QUOTE_PATH,
+						QUOTE_PATH, pg_data_native, QUOTE_PATH);
+		}
+	}
 
 	return 0;
 }