Skip to content

Commit e1d276f

Browse files
authored
Fix: replace gpscp with gpsync in ext fts (#470)
After commit 2ff7b0c, CBDB replaced gpscp with gpsync, but without change the external FTS logic. Also looks like CI(icw-external-fts) using the wrong package .
1 parent 061075c commit e1d276f

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

gpMgmt/bin/gpstart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ class GpStart:
9898

9999
etcd_config_tmp_file = "/tmp/cbdb_etcd.conf"
100100
coordinator_data_directory = os.environ.get("COORDINATOR_DATA_DIRECTORY")
101-
copy_etcd_config_file_cmd = f"gpscp -f {self.fts_hosts} {coordinator_data_directory + '/config' + '/cbdb_etcd.conf'} =:{etcd_config_tmp_file}"
101+
copy_etcd_config_file_cmd = f"gpsync -f {self.fts_hosts} {coordinator_data_directory + '/config' + '/cbdb_etcd.conf'} =:{etcd_config_tmp_file}"
102102
subprocess.check_output(copy_etcd_config_file_cmd, shell=True)
103103
logger.info("Begin to start all FTS process.")
104104
isdemo = (len(fts_host_machine_list) == 1)

gpMgmt/bin/lib/gp_bash_functions.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,9 +1301,9 @@ SETUP_FTS() {
13011301
FTS_LOG_DIR=$2
13021302
FTS_START_MODE=$3
13031303
if [ "$FTS_START_MODE" = "DEMO" ];then
1304-
nohup $GPHOME/bin/gpfts -F $GPHOME/bin/config/cbdb_etcd_default.conf -d ${FTS_LOG_DIR}/log/fts -D -C -a >/dev/null 2>&1 &
1304+
nohup $GPHOME/bin/gpsync -F $GPHOME/bin/config/cbdb_etcd_default.conf -d ${FTS_LOG_DIR}/log/fts -D -C -a >/dev/null 2>&1 &
13051305
else
1306-
gpscp -h ${FTS_HOST} $ETCD_CONFIG_FILE_PATH =:${ETCD_CONFIG_TMP_FILE}
1306+
gpsync -h ${FTS_HOST} $ETCD_CONFIG_FILE_PATH =:${ETCD_CONFIG_TMP_FILE}
13071307
FTS_CMD="mkdir -p ${FTS_LOG_DIR}/log/fts;nohup ${GPHOME}/bin/gpfts -F ${ETCD_CONFIG_TMP_FILE} -d ${FTS_LOG_DIR}/log/fts >/dev/null 2>&1 &"
13081308
gpssh -h ${FTS_HOST} -e "${FTS_CMD}"
13091309
fi

0 commit comments

Comments
 (0)