From 19ed27c290718cc868b0b3a5acb34b6006d6e030 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <hlinnakangas@pivotal.io>
Date: Fri, 5 Jan 2018 16:11:19 +0200
Subject: [PATCH] Update help texts for some utilites, for removal of
 filespaces.

---
 gpMgmt/Makefile               |  1 -
 gpMgmt/doc/gpexpand_help      | 10 +---------
 gpMgmt/doc/gpinitstandby_help | 24 ++----------------------
 gpMgmt/doc/gpinitsystem_help  |  8 ++++----
 4 files changed, 7 insertions(+), 36 deletions(-)

diff --git a/gpMgmt/Makefile b/gpMgmt/Makefile
index 712c4a186c..e8431c3112 100644
--- a/gpMgmt/Makefile
+++ b/gpMgmt/Makefile
@@ -14,7 +14,6 @@ SET_VERSION_SCRIPTS = \
 	bin/gpdbrestore \
 	bin/gpdeletesystem \
 	bin/gpexpand \
-	bin/gpfilespace \
 	bin/gpinitstandby \
 	bin/gpinitsystem \
 	bin/gpload.py \
diff --git a/gpMgmt/doc/gpexpand_help b/gpMgmt/doc/gpexpand_help
index 1742001a59..a37d234691 100644
--- a/gpMgmt/doc/gpexpand_help
+++ b/gpMgmt/doc/gpexpand_help
@@ -134,16 +134,8 @@ OPTIONS
  Specifies the name of the expansion configuration file, which contains 
  one line for each segment to be added in the format of:
 
-  <hostname>:<address>:<port>:<fselocation>:<dbid>:<content>:<preferred_role>:<replication_port>
+  <hostname>:<address>:<port>:<datadir>:<dbid>:<content>:<preferred_role>
 
- If your system has filespaces, gpexpand will expect a filespace configuration 
- file (<input_file_name>.fs) to exist in the same directory as your 
- expansion configuration file. The filespace configuration file is 
- in the format of:
-
-  filespaceOrder=<filespace1_name>:<filespace2_name>: ...
-  dbid:</path/for/filespace1>:</path/for/filespace2>: ...
-  dbid:</path/for/filespace1>:</path/for/filespace2>: ...
   ...
 
 
diff --git a/gpMgmt/doc/gpinitstandby_help b/gpMgmt/doc/gpinitstandby_help
index d2e826516d..fd74e8b483 100755
--- a/gpMgmt/doc/gpinitstandby_help
+++ b/gpMgmt/doc/gpinitstandby_help
@@ -7,8 +7,7 @@ Adds and/or initializes a standby master host for a Greenplum Database system.
 SYNOPSIS
 *****************************************************
 
-gpinitstandby { -s <standby_hostname> [-P <port>] 
-    [-F <list_of_filespaces>] | -r | -n } 
+gpinitstandby { -s <standby_hostname> [-P <port>] | -r | -n } 
 
 [-a] [-q] [-D] [-l <logfile_directory>]
 
@@ -80,23 +79,6 @@ OPTIONS
  Sets logging level to debug. 
 
 
--F <list_of_filespaces> 
-
- A list of filespace names and the associated locations. Each filespace 
- name and its location is separated by a colon. If there is more than one 
- file space name, each pair (name and location) is separated by a comma. 
- For example: 
-
- filespace1_name:fs1_location,filespace2_name:fs2_location 
-
- If this option is not specified, gpinitstandby prompts the user for the 
- filespace names and locations. 
-
- If the list is not formatted correctly or number of filespaces do not 
- match the number of filespaces already created in the system, 
- gpinitstandby returns an error. 
-
-
 -l <logfile_directory> 
 
  The directory to write the log file. Defaults to ~/gpAdminLogs. 
@@ -173,9 +155,7 @@ gpinitstandby -s myhost -P 2222
 If you specify the same host name as the active Greenplum Database 
 master, the installed Greenplum Database software that is used as a 
 standby master must be in a separate location from the active Greenplum 
-Database master. Also, filespace locations that are used by the standby 
-master must be different than the filespace locations used by the active 
-Greenplum Database master. 
+Database master.
 
 
 Remove the existing standby master from your Greenplum system 
diff --git a/gpMgmt/doc/gpinitsystem_help b/gpMgmt/doc/gpinitsystem_help
index 2e5b99c8dc..682e8a720e 100755
--- a/gpMgmt/doc/gpinitsystem_help
+++ b/gpMgmt/doc/gpinitsystem_help
@@ -13,7 +13,7 @@ gpinitsystem -c <gpinitsystem_config>
             [-B <parallel_processes>] 
             [-p <postgresql_conf_param_file>]
             [-s <standby_master_host>
-                [-P <standby_master_port>] [-F <standby_master_filespaces>]]
+                [-P <standby_master_port>] [-F <standby_master_datadir>]]
             [--max_connections=<number>] [--shared_buffers=<size>]
             [--locale=<locale>] [--lc-collate=<locale>] 
             [--lc-ctype=<locale>] [--lc-messages=<locale>] 
@@ -203,10 +203,10 @@ OPTIONS
  is the same as the primary master.
 
 
--F <standby_master_filespace>
+-F <standby_master_datadir>
 
- Optional and effective only when specified with -s.  This option can
- specify the filespace mappings.
+ Optional and effective only when specified with -s.  Specifies the
+ data directory of the standby.
 
 
 --su_password=<superuser_password> | -e <superuser_password>
-- 
GitLab