Fix gpinitsystem (apache#490)

* Fix gpinitsystem
   check if is is_external_fts in some places
* Remove guc gp_cbdb_deploy

gpMgmt/bin/gpaddmirrors

@@ -14,5 +14,4 @@ from gppylib.programs.clsAddMirrors import *
 
 #-------------------------------------------------------------------------
 if __name__ == '__main__':
-    check_deployment_mode('gpaddmirrors')
     simple_main( GpAddMirrorsProgram.createParser, GpAddMirrorsProgram.createProgram)

gpMgmt/bin/gpinitsystem

@@ -2093,20 +2093,9 @@ CREATE_FTS() {
         fi
 }
 
-CHECK_DEPLOYMENT_MODE() {
-	if [[ -n "${COORDINATOR_DIRECTORY}/${SEG_PREFIX}-1"  &&  -f ${COORDINATOR_DIRECTORY}/${SEG_PREFIX}-1/postgresql.conf ]]; then
-		gp_cbdb_deploy=`grep gp_cbdb_deploy ${COORDINATOR_DIRECTORY}/${SEG_PREFIX}-1/postgresql.conf | awk -F= '{print $1}'`
-		deployment_mode=`grep gp_cbdb_deploy ${COORDINATOR_DIRECTORY}/${SEG_PREFIX}-1/postgresql.conf | awk -F= '{print $2}'`
-		if [[ ${gp_cbdb_deploy:0:1} != '#' && $deployment_mode == "'cloud'" ]]; then
-			ERROR_EXIT "[FATAL]:gpinitsystem is disabled in cloud mode."
-		fi
-	fi
-}
-
 #******************************************************************************
 # Main Section
 #******************************************************************************
-CHECK_DEPLOYMENT_MODE
 trap 'ERROR_EXIT "[FATAL]:-Received INT or TERM signal"' INT TERM
 while getopts ":vaqe:c:l:-:p:m:h:n:s:P:S:b:DB:I:O:E:F:M:U:T:C" opt
 		do

gpMgmt/bin/gpmovemirrors

@@ -4,7 +4,7 @@
 #
 # Copyright (c) EMC Inc 2010. All Rights Reserved.
 #
-from gppylib.mainUtils import SimpleMainLock, ExceptionNoStackTraceNeeded, check_deployment_mode
+from gppylib.mainUtils import SimpleMainLock, ExceptionNoStackTraceNeeded
 
 import os
 import sys
@@ -55,7 +55,6 @@ The input file should be a plain text file with the format:
          An input file must be specified.
          """,
          ]
-check_deployment_mode('gpmovemirrors')
 
 
 # ----------------------- Command line option parser ----------------------

gpMgmt/bin/gppylib/mainUtils.py

@@ -466,10 +466,6 @@ def parseStatusLine(line, isStart = False, isStop = False):
     reasonStr = ":".join(reasonArr)
     return reasonCode, reasonStr, started, dir
 
-def check_deployment_mode(program_name):
-    deploymentMode = subprocess.check_output("gpconfig -s gp_cbdb_deploy | grep 'Coordinator value'| awk '{print $3}'", shell=True).decode().strip()
-    if deploymentMode == "cloud":
-        raise gp.GpError("%s is not supported in cloud deployment mode" % program_name)
 
 def check_fts(fts):
     fts_check_cmd= "ps -ef | awk '{print \$2, \$8}' | grep gpfts | grep -v grep"

gpMgmt/bin/gprecoverseg

@@ -10,11 +10,10 @@ if mirroring is configured and operational.
 # THIS IMPORT MUST COME FIRST
 #
 # import mainUtils FIRST to get python version check
-from gppylib.mainUtils import simple_main, check_deployment_mode 
+from gppylib.mainUtils import simple_main
 from gppylib.programs.clsRecoverSegment import GpRecoverSegmentProgram
 
 if __name__ == '__main__':
-    check_deployment_mode('gprecoverseg')
     simple_main(GpRecoverSegmentProgram.createParser,
                 GpRecoverSegmentProgram.createProgram,
                 GpRecoverSegmentProgram.mainOptions())

gpMgmt/bin/gpstart

@@ -927,5 +927,4 @@ class GpStart:
 
 
 if __name__ == '__main__':
-    check_deployment_mode('gpstart')
     simple_main(GpStart.createParser, GpStart.createProgram)

gpMgmt/bin/gpstop

@@ -978,6 +978,4 @@ class GpStop:
                       is_external_fts=external_fts)
 
 if __name__ == '__main__':
-    if len(sys.argv) != 2 or sys.argv[1] != "-u":
-        check_deployment_mode("gpstop")
     simple_main(GpStop.createParser, GpStop.createProgram)

gpMgmt/bin/lib/gp_bash_functions.sh

@@ -802,7 +802,7 @@ BUILD_COORDINATOR_PG_HBA_FILE () {
                 $ECHO "host     replication $USER_NAME         $STANDBY_HOSTNAME       trust" >> ${GP_DIR}/$PG_HBA
             fi
         fi
-        if [ "$CLUSTER_BOOT_MODE" = "PRODUCTION" ];then
+        if [ "$CLUSTER_BOOT_MODE" = "PRODUCTION" ] && [ $USE_EXTERNAL_FTS -ne 0 ];then
                 for fts in ${FTS_HOST_MACHINE_LIST[*]}
                 do
                         if [ ! "$FTS_HOST" = "$COORDINATOR_HOSTNAME" ];then

src/backend/cdb/cdbutil.c

@@ -2142,7 +2142,6 @@ char     *gp_etcd_account_id = NULL;
 char     *gp_etcd_cluster_id = NULL;
 char     *gp_etcd_namespace = NULL;
 char     *gp_etcd_endpoints = NULL;
-char     *gp_cbdb_deploy = NULL;
 
 static etcdlib_endpoint_t etcd_endpoints[GP_ETCD_ENDPOINTS_NUM] = {0};
 static int etcd_endpoints_num = 0;

src/backend/utils/misc/guc_gp.c

@@ -4726,16 +4726,6 @@ struct config_string ConfigureNamesString_gp[] =
 		"localhost:2379",
 		NULL, NULL, NULL
 	},
-	{
-		{"gp_cbdb_deploy", PGC_BACKEND, CUSTOM_OPTIONS,
-			gettext_noop("CBDB deploy environment setup."),
-			gettext_noop("This indicates the cbdb is deployed with onpromise or cloud environment. Default is onpromise"),
-			GUC_SUPERUSER_ONLY
-		},
-		&gp_cbdb_deploy,
-		"onpromise",
-		NULL, NULL, NULL
-	},
 #endif
 #ifdef ENABLE_IC_PROXY
 	{

src/include/cdb/cdbutil.h

@@ -37,7 +37,6 @@ extern char *gp_etcd_account_id;
 extern char *gp_etcd_cluster_id;
 extern char *gp_etcd_namespace;
 extern char *gp_etcd_endpoints;
-extern char *gp_cbdb_deploy;
 
 typedef struct GpSegConfigEntryForUDF
 {

src/include/common/etcdutils.h

@@ -32,7 +32,6 @@
 #define GP_ETCD_ACCOUNT_ID_DEFAULT "00000000-0000-0000-0000-000000000000"
 #define GP_ETCD_CLUSTER_ID_DEFAULT "00000000-0000-0000-0000-000000000000"
 #define GP_ETCD_ENDPOINTS_DEFAULT "localhost:2379"
-#define GP_CBDB_DEPLOY "onpromise"
 
 typedef struct etcdlib_endpoint {
     char *etcd_host;

src/include/utils/unsync_guc_name.h

@@ -211,7 +211,6 @@
 		"gp_etcd_cluster_id",
 		"gp_etcd_namespace",
 		"gp_etcd_endpoints",
-		"gp_cbdb_deploy",
 #endif
 		"gp_force_random_redistribution",
 		"gp_gang_creation_retry_count",