diff --git a/GNUmakefile.in b/GNUmakefile.in index e6333e39bec..bde27f24aa4 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -154,17 +154,17 @@ check-tests installcheck installcheck-parallel installcheck-tests: submake-gener $(MAKE) -C src/test/regress $@ check: - if [ ! -f $(prefix)/greenplum_path.sh ]; then \ + if [ ! -f $(prefix)/cloudberry-env.sh ]; then \ $(MAKE) -C $(top_builddir) install; \ fi - . $(prefix)/greenplum_path.sh; \ + . $(prefix)/cloudberry-env.sh; \ if pg_isready 1>/dev/null; then \ $(MAKE) -C $(top_builddir) installcheck; \ else \ if [ ! -f $(top_builddir)/gpAux/gpdemo/gpdemo-env.sh ]; then \ - . $(prefix)/greenplum_path.sh && $(MAKE) -C $(top_builddir) create-demo-cluster; \ + . $(prefix)/cloudberry-env.sh && $(MAKE) -C $(top_builddir) create-demo-cluster; \ fi; \ - . $(prefix)/greenplum_path.sh && . $(top_builddir)/gpAux/gpdemo/gpdemo-env.sh && $(MAKE) -C $(top_builddir) installcheck; \ + . $(prefix)/cloudberry-env.sh && . $(top_builddir)/gpAux/gpdemo/gpdemo-env.sh && $(MAKE) -C $(top_builddir) installcheck; \ fi $(call recurse,check-world,src/test src/pl src/interfaces/ecpg contrib src/bin gpcontrib,check) diff --git a/contrib/pax_storage/src/test/regress/mem_quota_util.py b/contrib/pax_storage/src/test/regress/mem_quota_util.py index 6e38a380029..7d830530c24 100755 --- a/contrib/pax_storage/src/test/regress/mem_quota_util.py +++ b/contrib/pax_storage/src/test/regress/mem_quota_util.py @@ -17,7 +17,7 @@ from multiprocessing import Process from gppylib.commands import unix except Exception as e: - sys.exit('Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(e)) + sys.exit('Cannot import modules. Please check that you have sourced cloudberry-env.sh. Detail: ' + str(e)) def parseargs( help=False ): parser = OptionParser() diff --git a/deploy/build/README.CentOS.bash b/deploy/build/README.CentOS.bash index ee9799d816e..44f81407e44 100755 --- a/deploy/build/README.CentOS.bash +++ b/deploy/build/README.CentOS.bash @@ -25,7 +25,7 @@ sudo yum install -y \ xerces-c-devel \ zlib-devel -# Needed for pygresql, or you can source greenplum_path.sh after compiling database and installing python-dependencies then +# Needed for pygresql, or you can source cloudberry-env.sh after compiling database and installing python-dependencies then sudo yum install -y \ postgresql \ postgresql-devel diff --git a/deploy/build/README.Linux.md b/deploy/build/README.Linux.md index 4f609855a38..283c4faf17e 100644 --- a/deploy/build/README.Linux.md +++ b/deploy/build/README.Linux.md @@ -170,7 +170,7 @@ After you have installed all the dependencies and performed the prerequisite pla make -j8 install ``` -3. Bring in the Greenplum environment for your running shell. +3. Bring in the Cloudberry environment for your running shell. ```bash cd .. @@ -179,7 +179,7 @@ After you have installed all the dependencies and performed the prerequisite pla chown -R gpadmin:gpadmin cloudberry/ su - gpadmin cd cloudberry/ - source /usr/local/cloudberry/greenplum_path.sh + source /usr/local/cloudberry/cloudberry-env.sh ``` 4. Start the demo cluster. diff --git a/deploy/build/README.macOS.bash b/deploy/build/README.macOS.bash index 4dff895df50..1d32bc29ee7 100755 --- a/deploy/build/README.macOS.bash +++ b/deploy/build/README.macOS.bash @@ -47,7 +47,7 @@ if [ ! -d /tmp/cbdb-devenv/gp-xerces ] ; then cd - || exit fi -# Needed for pygresql, or you can source greenplum_path.sh after compiling database and installing python-dependencies then +# Needed for pygresql, or you can source cloudberry-env.sh after compiling database and installing python-dependencies then brew install postgresql@14 brew install python3 @@ -107,7 +107,7 @@ cat << EOF ================ -Please source greenplum_path.sh after compiling database, then +Please source cloudberry-env.sh after compiling database, then pip3 install --user -r ../../python-dependencies.txt diff --git a/deploy/build/README.macOS.md b/deploy/build/README.macOS.md index 58a9ff86178..51e99e40947 100644 --- a/deploy/build/README.macOS.md +++ b/deploy/build/README.macOS.md @@ -60,9 +60,9 @@ BREWPREFIX=$(brew --prefix); export PATH="$BREWPREFIX/opt/gnu-sed/libexec/gnubin make -j8 make -j8 install -# 3. Bring in Greenplum environment for Apache Cloudberry into your running shell. +# 3. Bring in Cloudberry environment for Apache Cloudberry into your running shell. -source $(cd ~; pwd)/install/cbdb/greenplum_path.sh +source $(cd ~; pwd)/install/cbdb/cloudberry-env.sh # 4. Install the Python dependencies. diff --git a/deploy/build/README.md b/deploy/build/README.md index 12ca71e6596..0d9cf57eb9b 100644 --- a/deploy/build/README.md +++ b/deploy/build/README.md @@ -18,8 +18,8 @@ This guides describes how to build Apache Cloudberry from source code. make -j8 make -j8 install -# Bring in greenplum environment for CBDB into your running shell -source /usr/local/cloudberry/greenplum_path.sh +# Bring in cloudberry environment for CBDB into your running shell +source /usr/local/cloudberry/cloudberry-env.sh # Start demo cluster make create-demo-cluster diff --git a/gpAux/Makefile b/gpAux/Makefile index 6502cffd0c4..7f53f53591e 100644 --- a/gpAux/Makefile +++ b/gpAux/Makefile @@ -221,7 +221,6 @@ define BUILD_STEPS cd $(BUILDDIR) && PYGRESQL_LDFLAGS=' -Wl,-rpath,\$$$$ORIGIN/.. -Wl,--enable-new-dtags ' $(MAKE) $(PARALLEL_MAKE_OPTS) install cd $(BUILDDIR)/src/pl/plpython && $(MAKE) clean && $(MAKE) $(PARALLEL_MAKE_OPTS) install && cd $(BUILDDIR) cd $(BUILDDIR)/src/pl/plperl && $(MAKE) clean && echo "LDFLAGS += -Wl,-rpath,$(perl_archlibexp)/CORE -Wl,--enable-new-dtags" >> GNUmakefile && echo "LDFLAGS_SL += -Wl,-rpath,$(perl_archlibexp)/CORE -Wl,--enable-new-dtags" >> GNUmakefile && $(MAKE) $(PARALLEL_MAKE_OPTS) install && cd $(BUILDDIR) - #@$(MAKE) greenplum_path INSTLOC=$(INSTLOC) #@$(MAKE) mgmtcopy INSTLOC=$(INSTLOC) @$(MAKE) copylibs INSTLOC=$(INSTLOC) @$(MAKE) clients INSTLOC=$(INSTLOC) CLIENTSINSTLOC=$(CLIENTSINSTLOC) @@ -233,7 +232,7 @@ endef ifeq "$(BLD_GPDB_BUILDSET)" "partial" define BUILD_STEPS rm -rf $(INSTLOC) - cd $(BUILDDIR)/gpMgmt/ && $(MAKE) generate_greenplum_path_file + cd $(BUILDDIR)/gpMgmt/ && $(MAKE) generate_cloudberry_env_file cd $(BUILDDIR)/src/backend/ && $(MAKE) ../../src/include/parser/gram.h cd $(BUILDDIR)/src/backend/ && $(MAKE) ../../src/include/utils/errcodes.h cd $(BUILDDIR)/src/backend/ && $(MAKE) ../../src/include/utils/fmgroids.h diff --git a/gpAux/client/install/src/windows/CreatePackage.bat b/gpAux/client/install/src/windows/CreatePackage.bat index b6a782bebda..fe0cfd0bbee 100644 --- a/gpAux/client/install/src/windows/CreatePackage.bat +++ b/gpAux/client/install/src/windows/CreatePackage.bat @@ -3,7 +3,7 @@ set VERSION=%2 echo %VERSION% > %GPDB_INSTALL_PATH%\VERSION copy ..\..\..\..\..\NOTICE %GPDB_INSTALL_PATH% copy ..\..\..\..\..\LICENSE %GPDB_INSTALL_PATH% -copy ..\..\..\scripts\greenplum_clients_path.bat %GPDB_INSTALL_PATH% +copy ..\..\..\scripts\cloudberry_clients_path.bat %GPDB_INSTALL_PATH% mkdir %GPDB_INSTALL_PATH%\lib\python\yaml copy ..\..\..\..\..\gpMgmt\bin\gpload.py %GPDB_INSTALL_PATH%\bin mkdir %GPDB_INSTALL_PATH%\bin\gppylib @@ -15,4 +15,4 @@ for %%f in (..\..\..\..\..\gpMgmt\bin\pythonSrc\ext\PyYAML-*.tar.gz) do tar -xf for /D %%d in (PyYAML-*) do copy %%d\lib\yaml\* %GPDB_INSTALL_PATH%\lib\python\yaml perl -p -e "s,__VERSION_PLACEHOLDER__,%VERSION%," greenplum-clients.wxs > greenplum-clients-%VERSION%.wxs candle.exe -nologo greenplum-clients-%VERSION%.wxs -out greenplum-clients-%VERSION%.wixobj -dSRCDIR=%GPDB_INSTALL_PATH% -dVERSION=%VERSION% -light.exe -nologo -sval greenplum-clients-%VERSION%.wixobj -out greenplum-clients-x86_64.msi \ No newline at end of file +light.exe -nologo -sval greenplum-clients-%VERSION%.wixobj -out greenplum-clients-x86_64.msi diff --git a/gpAux/client/install/src/windows/greenplum-clients.wxs b/gpAux/client/install/src/windows/greenplum-clients.wxs index 0f17c299112..4e8f0128d8c 100755 --- a/gpAux/client/install/src/windows/greenplum-clients.wxs +++ b/gpAux/client/install/src/windows/greenplum-clients.wxs @@ -1100,7 +1100,7 @@ If you want to review or change any of your installation settings, click Back. C - + diff --git a/gpAux/client/scripts/greenplum_clients_path.bat b/gpAux/client/scripts/cloudberry_clients_path.bat similarity index 100% rename from gpAux/client/scripts/greenplum_clients_path.bat rename to gpAux/client/scripts/cloudberry_clients_path.bat diff --git a/gpAux/client/scripts/greenplum_clients_path.sh b/gpAux/client/scripts/cloudberry_clients_path.sh similarity index 60% rename from gpAux/client/scripts/greenplum_clients_path.sh rename to gpAux/client/scripts/cloudberry_clients_path.sh index 53dd4a286aa..f80ee53ed3f 100644 --- a/gpAux/client/scripts/greenplum_clients_path.sh +++ b/gpAux/client/scripts/cloudberry_clients_path.sh @@ -1,18 +1,3 @@ -# -------------------------------------------------------------------- -# NOTICE from the Apache Cloudberry PPMC -# -------------------------------------------------------------------- -# This file uses the term 'greenplum' to maintain compatibility with -# earlier versions of Apache Cloudberry, which was originally called -# Greenplum. This usage does not refer to VMware Tanzu Greenplum, -# nor does it imply that Apache Cloudberry (Incubating) is affiliated -# with, endorsed by, or sponsored by Broadcom Inc. -# -# This file will be renamed in a future Apache Cloudberry release to -# ensure compliance with Apache Software Foundation guidelines. -# We will announce the change on the project mailing list and website. -# -# See: https://lists.apache.org/thread/b8o974mnnqk6zpy86dgll2pgqcvqgnwm -# -------------------------------------------------------------------- if test -n "${ZSH_VERSION:-}"; then # zsh diff --git a/gpAux/gpdemo/README b/gpAux/gpdemo/README index 314de0d60b3..79e976fbd83 100644 --- a/gpAux/gpdemo/README +++ b/gpAux/gpdemo/README @@ -31,13 +31,13 @@ RUNNING GP DEMO su - gpadmin -2. Source greenplum_path.sh +2. Source cloudberry-env.sh - . /usr/local/gpdb/greenplum_path.sh + . /usr/local/cloudberry-db/cloudberry-env.sh Note: There is a space between the dot and the slash. - The "." will source the greenplum_path.sh into the current + The "." will source the cloudberry-env.sh into the current shell, instead of starting a subprocess. 3. Create the cluster at the current directory: diff --git a/gpAux/gpdemo/demo_cluster.sh b/gpAux/gpdemo/demo_cluster.sh index 8293fc687db..225bb76a5ee 100755 --- a/gpAux/gpdemo/demo_cluster.sh +++ b/gpAux/gpdemo/demo_cluster.sh @@ -120,7 +120,7 @@ cleanDemo(){ ## (export COORDINATOR_DATA_DIRECTORY=$QDDIR/${SEG_PREFIX}-1; - source ${GPHOME}/greenplum_path.sh; + source ${GPHOME}/cloudberry-env.sh; gpstop -ai) ## @@ -180,7 +180,7 @@ done if [ -z "${GPHOME}" ]; then echo "FATAL: The GPHOME environment variable is not set." echo "" - echo " You can set it by sourcing the greenplum_path.sh" + echo " You can set it by sourcing the cloudberry-env.sh" echo " file in your Cloudberry installation directory." echo "" exit 1 diff --git a/gpAux/releng/gppkg.mk b/gpAux/releng/gppkg.mk index 7706e7f4d8e..e93fcd1f74c 100644 --- a/gpAux/releng/gppkg.mk +++ b/gpAux/releng/gppkg.mk @@ -62,7 +62,7 @@ ifdef DEPENDENT_RPMS cp $${dep_rpm} gppkg/deps; \ done endif - source $(INSTLOC)/greenplum_path.sh && gppkg --build gppkg + source $(INSTLOC)/cloudberry-env.sh && gppkg --build gppkg rm -rf gppkg clean: @@ -74,6 +74,6 @@ ifdef EXTRA_CLEAN endif install: $(TARGET_GPPKG) - source $(INSTLOC)/greenplum_path.sh && gppkg -i $(TARGET_GPPKG) + source $(INSTLOC)/cloudberry-env.sh && gppkg -i $(TARGET_GPPKG) .PHONY: install clean diff --git a/gpMgmt/Makefile b/gpMgmt/Makefile index 372dae8ed46..60abfd04cb3 100644 --- a/gpMgmt/Makefile +++ b/gpMgmt/Makefile @@ -6,12 +6,12 @@ SUBDIRS= sbin bin doc $(recurse) -generate_greenplum_path_file: +generate_cloudberry_env_file: mkdir -p $(DESTDIR)$(prefix) unset LIBPATH; \ - bin/generate-greenplum-path.sh > $(DESTDIR)$(prefix)/greenplum_path.sh + bin/generate-cloudberry-env.sh > $(DESTDIR)$(prefix)/cloudberry-env.sh -install: generate_greenplum_path_file +install: generate_cloudberry_env_file mkdir -p $(DESTDIR)$(prefix)/lib/python # Setup /lib/python contents diff --git a/gpMgmt/bin/README.md b/gpMgmt/bin/README.md index e28809bd86e..3dae8248293 100644 --- a/gpMgmt/bin/README.md +++ b/gpMgmt/bin/README.md @@ -12,7 +12,7 @@ To run any of these python scripts, necessary libraries must be installed, and P PYTHONPATH="\$GPHOME/lib/python:${PYTHONPATH}" ``` -This will be set automatically with a `source $GPHOME/greenplum_path.sh` +This will be set automatically with a `source $GPHOME/cloudberry-env.sh` ## Python Version diff --git a/gpMgmt/bin/analyzedb b/gpMgmt/bin/analyzedb index cc51e265927..48d8e16872c 100755 --- a/gpMgmt/bin/analyzedb +++ b/gpMgmt/bin/analyzedb @@ -37,7 +37,7 @@ try: from gppylib.operations.unix import CheckDir, CheckFile, MakeDir except ImportError as e: - sys.exit('Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(e)) + sys.exit('Cannot import modules. Please check that you have sourced cloudberry-env.sh. Detail: ' + str(e)) EXECNAME = 'analyzedb' STATEFILE_DIR = 'db_analyze' diff --git a/gpMgmt/bin/generate-cloudberry-env.sh b/gpMgmt/bin/generate-cloudberry-env.sh new file mode 100755 index 00000000000..7f1f9074efc --- /dev/null +++ b/gpMgmt/bin/generate-cloudberry-env.sh @@ -0,0 +1,63 @@ +#!/usr/bin/env bash + +cat <<"EOF" +if test -n "${ZSH_VERSION:-}"; then + # zsh + SCRIPT_PATH="${(%):-%x}" +elif test -n "${BASH_VERSION:-}"; then + # bash + SCRIPT_PATH="${BASH_SOURCE[0]}" +else + # Unknown shell, hope below works. + # Tested with dash + result=$(lsof -p $$ -Fn | tail --lines=1 | xargs --max-args=2 | cut --delimiter=' ' --fields=2) + SCRIPT_PATH=${result#n} +fi + +if test -z "$SCRIPT_PATH"; then + echo "The shell cannot be identified. \$GPHOME may not be set correctly." >&2 +fi +SCRIPT_DIR="$(cd "$(dirname "${SCRIPT_PATH}")" >/dev/null 2>&1 && pwd)" + +if [ ! -L "${SCRIPT_DIR}" ]; then + GPHOME=${SCRIPT_DIR} +else + GPHOME=$(readlink "${SCRIPT_DIR}") +fi +EOF + +cat <<"EOF" +PYTHONPATH="${GPHOME}/lib/python" +PATH="${GPHOME}/bin:${PATH}" +LD_LIBRARY_PATH="${GPHOME}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + +if [ -e "${GPHOME}/etc/openssl.cnf" ]; then + OPENSSL_CONF="${GPHOME}/etc/openssl.cnf" +fi + +#setup JAVA_HOME +if [ -x "${GPHOME}/ext/jdk/bin/java" ]; then + JAVA_HOME="${GPHOME}/ext/jdk" + PATH="${JAVA_HOME}/bin:${PATH}" + CLASSPATH=${JAVA_HOME}/lib/dt.jar:${JAVA_HOME}/lib/tool.jar +fi + +export GPHOME +export PATH +export PYTHONPATH +export LD_LIBRARY_PATH +export OPENSSL_CONF +export JAVA_HOME +export CLASSPATH + +# Load the external environment variable files +if [ -d "${GPHOME}/etc/environment.d" ]; then + LOGGER=$(which logger 2> /dev/null || which true) + set -o allexport + for env in $(find "${GPHOME}/etc/environment.d" -regextype sed -regex '.*\/[0-9][0-9]-.*\.conf$' -type f | sort -n); do + $LOGGER -t "greenplum-path.sh" "loading environment from ${env}" + source "${env}" + done + set +o allexport +fi +EOF diff --git a/gpMgmt/bin/generate-greenplum-path.sh b/gpMgmt/bin/generate-greenplum-path.sh deleted file mode 100755 index 5a3b6e35698..00000000000 --- a/gpMgmt/bin/generate-greenplum-path.sh +++ /dev/null @@ -1,100 +0,0 @@ -#!/usr/bin/env bash -# -------------------------------------------------------------------- -# NOTICE from the Apache Cloudberry PPMC -# -------------------------------------------------------------------- -# This file uses the term 'greenplum' to maintain compatibility with -# earlier versions of Apache Cloudberry, which was originally called -# Greenplum. This usage does not refer to VMware Tanzu Greenplum, -# nor does it imply that Apache Cloudberry (Incubating) is affiliated -# with, endorsed by, or sponsored by Broadcom Inc. -# -# This file will be renamed in a future Apache Cloudberry release to -# ensure compliance with Apache Software Foundation guidelines. -# We will announce the change on the project mailing list and website. -# -# See: https://lists.apache.org/thread/b8o974mnnqk6zpy86dgll2pgqcvqgnwm -# -------------------------------------------------------------------- - -cat <<"EOF" -if [ -n "${PS1-}" ]; then - echo " -# -------------------------------------------------------------------- -# NOTICE from the Apache Cloudberry PPMC -# -------------------------------------------------------------------- -# This file uses the term 'greenplum' to maintain compatibility with -# earlier versions of Apache Cloudberry, which was originally called -# Greenplum. This usage does not refer to VMware Tanzu Greenplum, -# nor does it imply that Apache Cloudberry (Incubating) is affiliated -# with, endorsed by, or sponsored by Broadcom Inc. -# -# This file will be renamed in a future Apache Cloudberry release to -# ensure compliance with Apache Software Foundation guidelines. -# We will announce the change on the project mailing list and website. -# -# See: https://lists.apache.org/thread/b8o974mnnqk6zpy86dgll2pgqcvqgnwm -# -------------------------------------------------------------------- -" -fi -EOF - -cat <<"EOF" -if test -n "${ZSH_VERSION:-}"; then - # zsh - SCRIPT_PATH="${(%):-%x}" -elif test -n "${BASH_VERSION:-}"; then - # bash - SCRIPT_PATH="${BASH_SOURCE[0]}" -else - # Unknown shell, hope below works. - # Tested with dash - result=$(lsof -p $$ -Fn | tail --lines=1 | xargs --max-args=2 | cut --delimiter=' ' --fields=2) - SCRIPT_PATH=${result#n} -fi - -if test -z "$SCRIPT_PATH"; then - echo "The shell cannot be identified. \$GPHOME may not be set correctly." >&2 -fi -SCRIPT_DIR="$(cd "$(dirname "${SCRIPT_PATH}")" >/dev/null 2>&1 && pwd)" - -if [ ! -L "${SCRIPT_DIR}" ]; then - GPHOME=${SCRIPT_DIR} -else - GPHOME=$(readlink "${SCRIPT_DIR}") -fi -EOF - -cat <<"EOF" -PYTHONPATH="${GPHOME}/lib/python" -PATH="${GPHOME}/bin:${PATH}" -LD_LIBRARY_PATH="${GPHOME}/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" - -if [ -e "${GPHOME}/etc/openssl.cnf" ]; then - OPENSSL_CONF="${GPHOME}/etc/openssl.cnf" -fi - -#setup JAVA_HOME -if [ -x "${GPHOME}/ext/jdk/bin/java" ]; then - JAVA_HOME="${GPHOME}/ext/jdk" - PATH="${JAVA_HOME}/bin:${PATH}" - CLASSPATH=${JAVA_HOME}/lib/dt.jar:${JAVA_HOME}/lib/tool.jar -fi - -export GPHOME -export PATH -export PYTHONPATH -export LD_LIBRARY_PATH -export OPENSSL_CONF -export JAVA_HOME -export CLASSPATH - -# Load the external environment variable files -if [ -d "${GPHOME}/etc/environment.d" ]; then - LOGGER=$(which logger 2> /dev/null || which true) - set -o allexport - for env in $(find "${GPHOME}/etc/environment.d" -regextype sed -regex '.*\/[0-9][0-9]-.*\.conf$' -type f | sort -n); do - $LOGGER -t "greenplum-path.sh" "loading environment from ${env}" - source "${env}" - done - set +o allexport -fi -EOF diff --git a/gpMgmt/bin/gpactivatestandby b/gpMgmt/bin/gpactivatestandby index 4c2069f0970..020ead515f3 100755 --- a/gpMgmt/bin/gpactivatestandby +++ b/gpMgmt/bin/gpactivatestandby @@ -33,7 +33,7 @@ try: from gppylib.userinput import ask_yesno except Exception as e: sys.exit('ERROR: Cannot import modules. Please check that you ' - 'have sourced greenplum_path.sh. Detail: ' + str(e)) + 'have sourced cloudberry-env.sh. Detail: ' + str(e)) EXECNAME = os.path.split(__file__)[-1] diff --git a/gpMgmt/bin/gpconfig b/gpMgmt/bin/gpconfig index 7bd3023ea85..3d5495bd01b 100755 --- a/gpMgmt/bin/gpconfig +++ b/gpMgmt/bin/gpconfig @@ -34,7 +34,7 @@ try: from gpconfig_modules.parse_guc_metadata import ParseGuc except ImportError as err: sys.exit('Cannot import modules. Please check that you have sourced ' - 'greenplum_path.sh. Detail: ' + str(err)) + 'cloudberry-env.sh. Detail: ' + str(err)) EXECNAME = os.path.split(__file__)[-1] diff --git a/gpMgmt/bin/gpdeletesystem b/gpMgmt/bin/gpdeletesystem index 8299d86d820..3730d2758fe 100755 --- a/gpMgmt/bin/gpdeletesystem +++ b/gpMgmt/bin/gpdeletesystem @@ -24,7 +24,7 @@ try: from gppylib.operations.segment_tablespace_locations import get_tablespace_locations except ImportError as e: sys.exit('ERROR: Cannot import modules. Please check that you ' - 'have sourced greenplum_path.sh. Detail: ' + str(e)) + 'have sourced cloudberry-env.sh. Detail: ' + str(e)) EXECNAME = os.path.split(__file__)[-1] diff --git a/gpMgmt/bin/gpdirtableload b/gpMgmt/bin/gpdirtableload index 2ad6933059d..72f6dac9ca0 100755 --- a/gpMgmt/bin/gpdirtableload +++ b/gpMgmt/bin/gpdirtableload @@ -420,7 +420,7 @@ class gpdirtableload: 'greenplum_loaders_path.sh') elif os.environ.get('GPHOME'): srcfile = os.path.join(os.environ.get('GPHOME'), - 'greenplum_path.sh') + 'cloudberry-env.sh') if (not (srcfile and os.path.exists(srcfile))): self.log(self.ERROR, 'cannot find cloudberry environment ' + 'file: environment misconfigured') @@ -488,7 +488,7 @@ class gpdirtableload: 'greenplum_loaders_path.sh') elif os.environ.get('GPHOME'): srcfile = os.path.join(os.environ.get('GPHOME'), - 'greenplum_path.sh') + 'cloudberry-env.sh') if (not (srcfile and os.path.exists(srcfile))): self.log(self.ERROR, 'cannot find cloudberry environment ' + 'file: environment misconfigured') diff --git a/gpMgmt/bin/gpexpand b/gpMgmt/bin/gpexpand index 562fad58213..dcbed918a19 100755 --- a/gpMgmt/bin/gpexpand +++ b/gpMgmt/bin/gpexpand @@ -44,7 +44,7 @@ try: from gppylib.operations.update_pg_hba_on_segments import update_pg_hba_on_segments except ImportError as e: - sys.exit('ERROR: Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(e)) + sys.exit('ERROR: Cannot import modules. Please check that you have sourced cloudberry-env.sh. Detail: ' + str(e)) # constants MAX_PARALLEL_EXPANDS = 96 diff --git a/gpMgmt/bin/gpinitstandby b/gpMgmt/bin/gpinitstandby index 3e0ee7516bf..ad14c04946e 100755 --- a/gpMgmt/bin/gpinitstandby +++ b/gpMgmt/bin/gpinitstandby @@ -22,7 +22,7 @@ try: from gppylib.commands.pg import PgBaseBackup except ImportError as e: sys.exit('ERROR: Cannot import modules. Please check that you ' - 'have sourced greenplum_path.sh. Detail: ' + str(e)) + 'have sourced cloudberry-env.sh. Detail: ' + str(e)) EXECNAME = os.path.split(__file__)[-1] diff --git a/gpMgmt/bin/gpinitsystem b/gpMgmt/bin/gpinitsystem index 1ce4132e53d..fa85d42ae3f 100755 --- a/gpMgmt/bin/gpinitsystem +++ b/gpMgmt/bin/gpinitsystem @@ -2271,7 +2271,7 @@ LOG_MSG "[INFO]:-Apache Cloudberry instance successfully created" 1 LOG_MSG "[INFO]:-------------------------------------------------------" 1 LOG_MSG "[INFO]:-To complete the environment configuration, please " 1 LOG_MSG "[INFO]:-update $USER_NAME .bashrc file with the following" 1 -LOG_MSG "[INFO]:-1. Ensure that the greenplum_path.sh file is sourced" 1 +LOG_MSG "[INFO]:-1. Ensure that the cloudberry-env.sh file is sourced" 1 LOG_MSG "[INFO]:-2. Add \"export COORDINATOR_DATA_DIRECTORY=${COORDINATOR_DIRECTORY}/${SEG_PREFIX}-1\"" 1 LOG_MSG "[INFO]:- to access the Cloudberry scripts for this instance:" 1 LOG_MSG "[INFO]:- or, use -d ${COORDINATOR_DIRECTORY}/${SEG_PREFIX}-1 option for the Cloudberry scripts" 1 diff --git a/gpMgmt/bin/gpload b/gpMgmt/bin/gpload index 33a0ec0e9f3..fb945286fff 100755 --- a/gpMgmt/bin/gpload +++ b/gpMgmt/bin/gpload @@ -1,6 +1,6 @@ #!/usr/bin/env bash if [ ! -z "$GPHOME" ]; then - . $GPHOME/greenplum_path.sh + . $GPHOME/cloudberry-env.sh fi if [ ! -z "$GPHOME_LOADERS" ]; then . $GPHOME_LOADERS/greenplum_loaders_path.sh diff --git a/gpMgmt/bin/gpload.py b/gpMgmt/bin/gpload.py index a1696947bbc..82a0a571166 100755 --- a/gpMgmt/bin/gpload.py +++ b/gpMgmt/bin/gpload.py @@ -1654,7 +1654,7 @@ def start_gpfdists(self): 'greenplum_loaders_path.sh') elif os.environ.get('GPHOME'): srcfile = os.path.join(os.environ.get('GPHOME'), - 'greenplum_path.sh') + 'cloudberry-env.sh') if (not (srcfile and os.path.exists(srcfile))): self.log(self.ERROR, 'cannot find cloudberry environment ' + diff --git a/gpMgmt/bin/gpload_test/gpload2/README b/gpMgmt/bin/gpload_test/gpload2/README index 588812f82a2..b29c28771a0 100644 --- a/gpMgmt/bin/gpload_test/gpload2/README +++ b/gpMgmt/bin/gpload_test/gpload2/README @@ -2,7 +2,7 @@ The remote tests is intended to be run for remote server, which means you are compiling loader package on local machine but GPDB server is located on a separate machine. -To run this test, first source greenplum_path.sh in +To run this test, first source cloudberry-env.sh in cloudberry-db-devel, not the greenplum-loaders-devel, because loader package don't have the necessary diff tools. diff --git a/gpMgmt/bin/gpload_test/gpload2/TEST_local_base.py b/gpMgmt/bin/gpload_test/gpload2/TEST_local_base.py index 5c47e724ff3..45d885ec87a 100755 --- a/gpMgmt/bin/gpload_test/gpload2/TEST_local_base.py +++ b/gpMgmt/bin/gpload_test/gpload2/TEST_local_base.py @@ -95,7 +95,7 @@ def getPortCoordinatorOnly(host = 'localhost',coordinator_value = None, coordinator_pattern = r"Context:\s*-1\s*Value:\s*\d+" command = "gpconfig -s %s" % ( "port" ) - cmd = "source %s/greenplum_path.sh; export COORDINATOR_DATA_DIRECTORY=%s; export PGPORT=%s; %s" \ + cmd = "source %s/cloudberry-env.sh; export COORDINATOR_DATA_DIRECTORY=%s; export PGPORT=%s; %s" \ % (gphome, cdd, port, command) (ok,out) = run(cmd) diff --git a/gpMgmt/bin/gplogfilter b/gpMgmt/bin/gplogfilter index 693fb7c2f05..a667ae34002 100755 --- a/gpMgmt/bin/gplogfilter +++ b/gpMgmt/bin/gplogfilter @@ -24,7 +24,7 @@ try: from gppylib.logfilter import * from gppylib.commands.gp import get_coordinatordatadir except ImportError as e: - sys.exit('ERROR: Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(e)) + sys.exit('ERROR: Cannot import modules. Please check that you have sourced cloudberry-env.sh. Detail: ' + str(e)) # These values are from cdb-pg/src/backend/po/*.po TROUBLE_VALUES = [ diff --git a/gpMgmt/bin/gpmemwatcher b/gpMgmt/bin/gpmemwatcher index 6569015bc09..1fb39adfad8 100755 --- a/gpMgmt/bin/gpmemwatcher +++ b/gpMgmt/bin/gpmemwatcher @@ -132,7 +132,7 @@ def launchProcess(host, workdir): if not gphome: raise Exception('Environment Variable GPHOME not set') - py_string = 'source ' + os.path.join(gphome, 'greenplum_path.sh') + '; ' + py_string = 'source ' + os.path.join(gphome, 'cloudberry-env.sh') + '; ' # Now let's just quick check the host as to whether the python version is >= 2.6 try: diff --git a/gpMgmt/bin/gpmovemirrors b/gpMgmt/bin/gpmovemirrors index 7220a0f897e..c5e694399a5 100755 --- a/gpMgmt/bin/gpmovemirrors +++ b/gpMgmt/bin/gpmovemirrors @@ -30,7 +30,7 @@ try: from gppylib.operations.update_pg_hba_on_segments import update_pg_hba_for_new_mirrors except ImportError as e: - sys.exit('ERROR: Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(e)) + sys.exit('ERROR: Cannot import modules. Please check that you have sourced cloudberry-env.sh. Detail: ' + str(e)) # constants GPDB_STOPPED = 1 diff --git a/gpMgmt/bin/gppylib/commands/base.py b/gpMgmt/bin/gppylib/commands/base.py index 98481425071..d455c6e2d13 100755 --- a/gpMgmt/bin/gppylib/commands/base.py +++ b/gpMgmt/bin/gppylib/commands/base.py @@ -510,10 +510,10 @@ def execute(self, cmd, pickled=False, start_new_session=False): if localhost != self.targetHost: cmd.cmdStr = "ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 " \ "{targethost} \"{gphome} {cmdstr}\"".format(targethost=self.targetHost, - gphome=". %s/greenplum_path.sh;" % self.gphome, + gphome=". %s/cloudberry-env.sh;" % self.gphome, cmdstr=cmd.cmdStr) else: - cmd.cmdStr = "bash -c \"{gphome} {cmdstr}\"".format(gphome=". %s/greenplum_path.sh;" % self.gphome, + cmd.cmdStr = "bash -c \"{gphome} {cmdstr}\"".format(gphome=". %s/cloudberry-env.sh;" % self.gphome, cmdstr=cmd.cmdStr) LocalExecutionContext.execute(self, cmd, pickled=pickled, start_new_session=start_new_session) if (cmd.get_stderr().startswith('ssh_exchange_identification: Connection closed by remote host')): diff --git a/gpMgmt/bin/gppylib/commands/test/unit/test_unit_base.py b/gpMgmt/bin/gppylib/commands/test/unit/test_unit_base.py index 6de0f145edf..9f9e6105dad 100644 --- a/gpMgmt/bin/gppylib/commands/test/unit/test_unit_base.py +++ b/gpMgmt/bin/gppylib/commands/test/unit/test_unit_base.py @@ -17,13 +17,13 @@ def test_RemoteExecutionContext_uses_default_gphome(self): self.subject = RemoteExecutionContext("myhost", "my_stdin") cmd = Command("dummy name", "echo 'foo'") self.subject.execute(cmd) - self.assertIn(". %s/greenplum_path.sh;" % GPHOME, cmd.cmdStr) + self.assertIn(". %s/cloudberry-env.sh;" % GPHOME, cmd.cmdStr) def test_RemoteExecutionContext_uses_provided_gphome_when_set(self): self.subject = RemoteExecutionContext(targetHost="myhost", stdin="my_stdin", gphome="other/gphome") cmd = Command("dummy name", "echo 'foo'") self.subject.execute(cmd) - self.assertIn(". other/gphome/greenplum_path.sh;", cmd.cmdStr) + self.assertIn(". other/gphome/cloudberry-env.sh;", cmd.cmdStr) def test_LocalExecutionContext_uses_no_environment(self): self.subject = LocalExecutionContext(None) @@ -53,7 +53,7 @@ def test_RemoteExecutionContext_uses_ampersand_multiple(self): cmd.propagate_env_map['bar'] = 1 self.subject.execute(cmd) self.assertEqual("bar=1 && foo=1 && ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 localhost " - "\". gphome/greenplum_path.sh; bar=1 && foo=1 && ls /tmp\"", cmd.cmdStr) + "\". gphome/cloudberry-env.sh; bar=1 && foo=1 && ls /tmp\"", cmd.cmdStr) @patch('gppylib.commands.base.Command.get_stderr', return_value="ssh_exchange_identification: Connection closed by remote host") diff --git a/gpMgmt/bin/gppylib/operations/package.py b/gpMgmt/bin/gppylib/operations/package.py index 2af3bfba381..f6f52a634ae 100644 --- a/gpMgmt/bin/gppylib/operations/package.py +++ b/gpMgmt/bin/gppylib/operations/package.py @@ -24,7 +24,7 @@ from yaml.scanner import ScannerError except ImportError as ex: sys.exit( - 'Operation: Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(ex)) + 'Operation: Cannot import modules. Please check that you have sourced cloudberry-env.sh. Detail: ' + str(ex)) logger = gplog.get_default_logger() diff --git a/gpMgmt/bin/gppylib/programs/gppkg.py b/gpMgmt/bin/gppylib/programs/gppkg.py index f784386ea5f..70682b67a1c 100755 --- a/gpMgmt/bin/gppylib/programs/gppkg.py +++ b/gpMgmt/bin/gppylib/programs/gppkg.py @@ -20,7 +20,7 @@ from gppylib.operations.unix import ListFilesByPattern except ImportError as ex: - sys.exit('Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(ex)) + sys.exit('Cannot import modules. Please check that you have sourced cloudberry-env.sh. Detail: ' + str(ex)) logger = gplog.get_default_logger() diff --git a/gpMgmt/bin/gpshrink b/gpMgmt/bin/gpshrink index 4b1603e5093..05b4966ee19 100644 --- a/gpMgmt/bin/gpshrink +++ b/gpMgmt/bin/gpshrink @@ -43,7 +43,7 @@ try: from gppylib.operations.update_pg_hba_on_segments import update_pg_hba_on_segments except ImportError as e: - sys.exit('ERROR: Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(e)) + sys.exit('ERROR: Cannot import modules. Please check that you have sourced cloudberry-env.sh. Detail: ' + str(e)) # constants MAX_PARALLEL_SHRINKS = 96 diff --git a/gpMgmt/bin/gpssh b/gpMgmt/bin/gpssh index b27cb5cf47b..f3105599d21 100755 --- a/gpMgmt/bin/gpssh +++ b/gpMgmt/bin/gpssh @@ -211,7 +211,7 @@ def interactive(): GV.session.login(GV.opt['-h'], GV.USER, GV.DELAY_BEFORE_SEND, GV.PROMPT_VALIDATION_TIMEOUT, GV.SYNC_RETRIES) GV.session.echoCommand = GV.opt['-e'] if GV.opt['-s']: - GV.session.executeCommand("source {0}/greenplum_path.sh".format(os.environ["GPHOME"])) + GV.session.executeCommand("source {0}/cloudberry-env.sh".format(os.environ["GPHOME"])) GV.session.cmdloop() except pexpect.EOF: print('\n[Unexpected EOF from some hosts...]') @@ -265,7 +265,7 @@ def main(): GV.session.login(GV.opt['-h'], GV.USER, GV.DELAY_BEFORE_SEND, GV.PROMPT_VALIDATION_TIMEOUT, GV.SYNC_RETRIES) GV.session.echoCommand = GV.opt['-e'] if GV.opt['-s']: - GV.session.executeCommand("source {0}/greenplum_path.sh".format(os.environ["GPHOME"])) + GV.session.executeCommand("source {0}/cloudberry-env.sh".format(os.environ["GPHOME"])) output = GV.session.executeCommand(GV.argcmd) GV.session.writeCommandOutput(output) if GV.session.verbose: print('[INFO] completed successfully') diff --git a/gpMgmt/bin/gpstart b/gpMgmt/bin/gpstart index 6937d86ac51..0165c0cc371 100755 --- a/gpMgmt/bin/gpstart +++ b/gpMgmt/bin/gpstart @@ -34,7 +34,7 @@ try: from gppylib.utils import TableLogger from gppylib.gp_era import GpEraFile except ImportError as e: - sys.exit('Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(e)) + sys.exit('Cannot import modules. Please check that you have sourced cloudberry-env.sh. Detail: ' + str(e)) logger = get_default_logger() diff --git a/gpMgmt/bin/gpstop b/gpMgmt/bin/gpstop index 5f89bb90b02..e8e8e3855a9 100755 --- a/gpMgmt/bin/gpstop +++ b/gpMgmt/bin/gpstop @@ -36,7 +36,7 @@ try: from gppylib.operations.rebalanceSegments import ReconfigDetectionSQLQueryCommand from gppylib.operations.detect_unreachable_hosts import get_unreachable_segment_hosts except ImportError as e: - sys.exit('ERROR: Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(e)) + sys.exit('ERROR: Cannot import modules. Please check that you have sourced cloudberry-env.sh. Detail: ' + str(e)) DEFAULT_NUM_WORKERS = 64 logger = get_default_logger() diff --git a/gpMgmt/bin/lib/gp_bash_functions.sh b/gpMgmt/bin/lib/gp_bash_functions.sh index 2276cdb900c..de76620da2b 100755 --- a/gpMgmt/bin/lib/gp_bash_functions.sh +++ b/gpMgmt/bin/lib/gp_bash_functions.sh @@ -28,8 +28,8 @@ declare -a GPPATH GPPATH=( $GPHOME $MPPHOME $BIZHOME ) if [ ${#GPPATH[@]} -eq 0 ];then echo "[FATAL]:-GPHOME environment variable is required to run GPDB but could not be found." - echo "Please set it by sourcing the greenplum_path.sh in your GPDB installation directory." - echo "Example: ''. /usr/local/gpdb/greenplum_path.sh''" + echo "Please set it by sourcing the cloudberry-env.sh in your GPDB installation directory." + echo "Example: ''. /usr/local/gpdb/cloudberry-env.sh''" exit 1 fi diff --git a/gpMgmt/bin/lib/gpcreateseg.sh b/gpMgmt/bin/lib/gpcreateseg.sh index 2dfa970d864..5dd0f5b0006 100755 --- a/gpMgmt/bin/lib/gpcreateseg.sh +++ b/gpMgmt/bin/lib/gpcreateseg.sh @@ -222,8 +222,8 @@ CREATE_QES_MIRROR () { PG_HBA_ENTRIES="${PG_HBA_ENTRIES}"$'\n'"host replication ${GP_USER} ${PRIMARY_HOSTADDRESS} trust" fi fi - RUN_COMMAND_REMOTE ${PRIMARY_HOSTADDRESS} "${EXPORT_GPHOME}; . ${GPHOME}/greenplum_path.sh; cat - >> ${PRIMARY_DIR}/pg_hba.conf; pg_ctl -D ${PRIMARY_DIR} reload" <<< "${PG_HBA_ENTRIES}" - RUN_COMMAND_REMOTE ${GP_HOSTADDRESS} "${EXPORT_GPHOME}; . ${GPHOME}/greenplum_path.sh; rm -rf ${GP_DIR}; ${GPHOME}/bin/pg_basebackup --wal-method=stream --create-slot --slot='internal_wal_replication_slot' -R -c fast -E ./db_dumps -D ${GP_DIR} -h ${PRIMARY_HOSTADDRESS} -p ${PRIMARY_PORT} --target-gp-dbid ${GP_DBID};" + RUN_COMMAND_REMOTE ${PRIMARY_HOSTADDRESS} "${EXPORT_GPHOME}; . ${GPHOME}/cloudberry-env.sh; cat - >> ${PRIMARY_DIR}/pg_hba.conf; pg_ctl -D ${PRIMARY_DIR} reload" <<< "${PG_HBA_ENTRIES}" + RUN_COMMAND_REMOTE ${GP_HOSTADDRESS} "${EXPORT_GPHOME}; . ${GPHOME}/cloudberry-env.sh; rm -rf ${GP_DIR}; ${GPHOME}/bin/pg_basebackup --wal-method=stream --create-slot --slot='internal_wal_replication_slot' -R -c fast -E ./db_dumps -D ${GP_DIR} -h ${PRIMARY_HOSTADDRESS} -p ${PRIMARY_PORT} --target-gp-dbid ${GP_DBID};" START_QE "-w" RETVAL=$? PARA_EXIT $RETVAL "pg_basebackup of segment data directory from ${PRIMARY_HOSTADDRESS} to ${GP_HOSTADDRESS}" diff --git a/gpMgmt/doc/gplogfilter_help b/gpMgmt/doc/gplogfilter_help index 9f0c284b403..60afde9d085 100644 --- a/gpMgmt/doc/gplogfilter_help +++ b/gpMgmt/doc/gplogfilter_help @@ -32,7 +32,7 @@ once by running it through the gpssh utility. For example, to display the last three lines of each segment log file: gpssh -f seg_host_file - => source /usr/local/greenplum-db/greenplum_path.sh + => source /usr/local/greenplum-db/cloudberry-env.sh => gplogfilter -n 3 /gpdata/*/log/gpdb*.csv By default, the output of gplogfilter is sent to standard output. Use @@ -217,7 +217,7 @@ messages in the segment log files containing the string 'con6' and save output to a file. gpssh -f seg_hosts_file -e 'source - /usr/local/greenplum-db/greenplum_path.sh ; gplogfilter -f con6 + /usr/local/greenplum-db/cloudberry-env.sh ; gplogfilter -f con6 /gpdata/*/log/gpdb*.csv' > seglog.out diff --git a/gpMgmt/doc/gpssh_help b/gpMgmt/doc/gpssh_help index 8a0c7f0ffb0..fe93572bf83 100755 --- a/gpMgmt/doc/gpssh_help +++ b/gpMgmt/doc/gpssh_help @@ -101,7 +101,7 @@ OPTIONS -s Optional. If specified, before executing any commands on the target - host, gpssh sources the file greenplum_path.sh in the directory + host, gpssh sources the file cloudberry-env.sh in the directory specified by the $GPHOME environment variable. This option is valid for both interactive mode and single command mode. diff --git a/gpMgmt/sbin/gpconfig_helper.py b/gpMgmt/sbin/gpconfig_helper.py index 158e0332cb4..8313ad44e04 100755 --- a/gpMgmt/sbin/gpconfig_helper.py +++ b/gpMgmt/sbin/gpconfig_helper.py @@ -22,7 +22,7 @@ from optparse import Option, OptionParser from gppylib.gpparseopts import OptParser, OptChecker except ImportError as e: - sys.exit('Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(e)) + sys.exit('Cannot import modules. Please check that you have sourced cloudberry-env.sh. Detail: ' + str(e)) _help = ["""This enables one to add, get and remove postgresql.conf configuration parameters. The absolute path to the postgresql.conf file is required."""] diff --git a/gpMgmt/test/README b/gpMgmt/test/README index 16a36ab43fe..c4863f669c0 100644 --- a/gpMgmt/test/README +++ b/gpMgmt/test/README @@ -5,7 +5,7 @@ if they are not already installed on your machine. To run behave: -source greenplum_path.sh +source cloudberry-env.sh cd gpMgmt "make -f Makefile.behave behave" will run all the integration tests. diff --git a/gpMgmt/test/behave/mgmt_utils/gpinitsystem.feature b/gpMgmt/test/behave/mgmt_utils/gpinitsystem.feature index 00fbd568dbf..1d69a5403ff 100644 --- a/gpMgmt/test/behave/mgmt_utils/gpinitsystem.feature +++ b/gpMgmt/test/behave/mgmt_utils/gpinitsystem.feature @@ -253,7 +253,7 @@ Feature: gpinitsystem tests And a working directory of the test as '/tmp/gpinitsystem' # create a dummy dca version file so that DCA specific parameters are set And the user runs command "touch /tmp/gpinitsystem/gpdb-appliance-version" - When the user runs command "source $GPHOME/greenplum_path.sh; __DCA_VERSION_FILE__=/tmp/gpinitsystem/gpdb-appliance-version $GPHOME/bin/gpinitsystem -a -c ../gpAux/gpdemo/clusterConfigFile" + When the user runs command "source $GPHOME/cloudberry-env.sh; __DCA_VERSION_FILE__=/tmp/gpinitsystem/gpdb-appliance-version $GPHOME/bin/gpinitsystem -a -c ../gpAux/gpdemo/clusterConfigFile" Then gpinitsystem should return a return code of 0 # the log file must have the entry indicating that DCA specific configuration has been set And the user runs command "grep -E 'Setting DCA specific configuration values' ~/gpAdminLogs/gpinitsystem*log" diff --git a/gpMgmt/test/behave/mgmt_utils/steps/mgmt_utils.py b/gpMgmt/test/behave/mgmt_utils/steps/mgmt_utils.py index dfcc137fe71..5af0e37762e 100644 --- a/gpMgmt/test/behave/mgmt_utils/steps/mgmt_utils.py +++ b/gpMgmt/test/behave/mgmt_utils/steps/mgmt_utils.py @@ -748,7 +748,7 @@ def impl(context, command, hostname): run_command_remote(context, command, hostname, - os.getenv("GPHOME") + '/greenplum_path.sh', + os.getenv("GPHOME") + '/cloudberry-env.sh', 'export COORDINATOR_DATA_DIRECTORY=%s' % coordinator_data_dir) if has_exception(context): raise context.exception @@ -788,7 +788,7 @@ def impl(context, HOST, port, dir, ctxt): remote_gphome = os.environ.get('GPHOME') if not dir.startswith("/"): dir = os.environ.get(dir) - gp_source_file = os.path.join(remote_gphome, 'greenplum_path.sh') + gp_source_file = os.path.join(remote_gphome, 'cloudberry-env.sh') gpfdist = Gpfdist('gpfdist on host %s' % host, dir, port, os.path.join(dir, 'gpfdist.pid'), int(ctxt), host, gp_source_file) gpfdist.startGpfdist() @@ -801,7 +801,7 @@ def impl(context, HOST, port, dir, ctxt): remote_gphome = os.environ.get('GPHOME') if not dir.startswith("/"): dir = os.environ.get(dir) - gp_source_file = os.path.join(remote_gphome, 'greenplum_path.sh') + gp_source_file = os.path.join(remote_gphome, 'cloudberry-env.sh') gpfdist = Gpfdist('gpfdist on host %s' % host, dir, port, os.path.join(dir, 'gpfdist.pid'), int(ctxt), host, gp_source_file) gpfdist.cleanupGpfdist() @@ -1045,7 +1045,7 @@ def impl(context, filepath): run_command_remote(context, cmd, context.standby_hostname, - os.getenv("GPHOME") + '/greenplum_path.sh', + os.getenv("GPHOME") + '/cloudberry-env.sh', 'export COORDINATOR_DATA_DIRECTORY=%s' % context.standby_data_dir, validateAfter=True) except: @@ -1173,7 +1173,7 @@ def impl(context, coordinator, standby): run_command_remote(context, cmd, context.coordinator_hostname, - os.getenv("GPHOME") + '/greenplum_path.sh', + os.getenv("GPHOME") + '/cloudberry-env.sh', 'export COORDINATOR_DATA_DIRECTORY=%s' % context.standby_data_dir) context.stdout_position = 0 @@ -1290,7 +1290,7 @@ def impl(context, command): run_command_remote(context, cmd, context.standby_hostname, - os.getenv("GPHOME") + '/greenplum_path.sh', + os.getenv("GPHOME") + '/cloudberry-env.sh', 'export COORDINATOR_DATA_DIRECTORY=%s' % context.standby_data_dir, validateAfter=False) @@ -1365,7 +1365,7 @@ def impl(context): run_command_remote(context, cmd, context.standby_hostname, - os.getenv("GPHOME") + '/greenplum_path.sh', + os.getenv("GPHOME") + '/cloudberry-env.sh', 'export COORDINATOR_DATA_DIRECTORY=%s' % context.standby_data_dir) @@ -1444,7 +1444,7 @@ def stop_segments(context, where_clause): # For demo_cluster tests that run on the CI gives the error 'bash: pg_ctl: command not found' # Thus, need to add pg_ctl to the path when ssh'ing to a demo cluster. subprocess.check_call(['ssh', seg.getSegmentHostName(), - 'source %s/greenplum_path.sh && pg_ctl stop -m fast -D %s -w -t 120' % ( + 'source %s/cloudberry-env.sh && pg_ctl stop -m fast -D %s -w -t 120' % ( pipes.quote(os.environ.get("GPHOME")), pipes.quote(seg.getSegmentDataDirectory())) ]) @@ -1478,7 +1478,7 @@ def stop_segments_immediate(context, where_clause): # For demo_cluster tests that run on the CI gives the error 'bash: pg_ctl: command not found' # Thus, need to add pg_ctl to the path when ssh'ing to a demo cluster. subprocess.check_call(['ssh', seg.getSegmentHostName(), - 'source %s/greenplum_path.sh && pg_ctl stop -m immediate -D %s -w' % ( + 'source %s/cloudberry-env.sh && pg_ctl stop -m immediate -D %s -w' % ( pipes.quote(os.environ.get("GPHOME")), pipes.quote(seg.getSegmentDataDirectory())) ]) @@ -2143,7 +2143,7 @@ def impl(context, filename, contain, output): @given('the gpfdists occupying port {port} on host "{hostfile}"') def impl(context, port, hostfile): remote_gphome = os.environ.get('GPHOME') - gp_source_file = os.path.join(remote_gphome, 'greenplum_path.sh') + gp_source_file = os.path.join(remote_gphome, 'cloudberry-env.sh') source_map_file = os.environ.get(hostfile) dir = '/tmp' ctxt = 2 @@ -2160,7 +2160,7 @@ def impl(context, port, hostfile): @then('the gpfdists running on port {port} get cleaned up from host "{hostfile}"') def impl(context, port, hostfile): remote_gphome = os.environ.get('GPHOME') - gp_source_file = os.path.join(remote_gphome, 'greenplum_path.sh') + gp_source_file = os.path.join(remote_gphome, 'cloudberry-env.sh') source_map_file = os.environ.get(hostfile) dir = '/tmp' ctxt = 2 @@ -2293,7 +2293,7 @@ def impl(context, table, dbname, segid): port = port.strip() host = host.strip() user = os.environ.get('USER') - source_file = os.path.join(os.environ.get('GPHOME'), 'greenplum_path.sh') + source_file = os.path.join(os.environ.get('GPHOME'), 'cloudberry-env.sh') # Yes, the below line is ugly. It looks much uglier when done with separate strings, given the multiple levels of escaping required. remote_cmd = """ ssh %s "source %s; export PGUSER=%s; export PGPORT=%s; export PGOPTIONS=\\\"-c gp_role=utility\\\"; psql -d %s -c \\\"SET allow_system_table_mods=true; DELETE FROM pg_attribute where attrelid=\'%s\'::regclass::oid;\\\"" @@ -2309,7 +2309,7 @@ def impl(context, table, dbname, segid): port = port.strip() host = host.strip() user = os.environ.get('USER') - source_file = os.path.join(os.environ.get('GPHOME'), 'greenplum_path.sh') + source_file = os.path.join(os.environ.get('GPHOME'), 'cloudberry-env.sh') # Yes, the below line is ugly. It looks much uglier when done with separate strings, given the multiple levels of escaping required. remote_cmd = """ ssh %s "source %s; export PGUSER=%s; export PGPORT=%s; export PGOPTIONS=\\\"-c gp_role=utility\\\"; psql -d %s -c \\\"SET allow_system_table_mods=true; UPDATE pg_class SET relnatts=relnatts + 2 WHERE relname=\'%s\';\\\"" @@ -2619,14 +2619,14 @@ def impl(context, location): directory location for all hosts in the cluster. """ gphome = os.environ["GPHOME"] - greenplum_path = path.join(gphome, 'greenplum_path.sh') + cloudberry_env = path.join(gphome, 'cloudberry-env.sh') - # First replace the GPHOME envvar in greenplum_path.sh. + # First replace the GPHOME envvar in cloudberry-env.sh. subprocess.check_call([ 'sed', '-i.bak', # we use this backup later '-e', r's|^GPHOME=.*$|GPHOME={}|'.format(location), - greenplum_path, + cloudberry_env, ]) try: @@ -2646,9 +2646,9 @@ def impl(context, location): ]) finally: - # Put greenplum_path.sh back the way it was. + # Put cloudberry-env.sh back the way it was. subprocess.check_call([ - 'mv', '{}.bak'.format(greenplum_path), greenplum_path + 'mv', '{}.bak'.format(cloudberry_env), cloudberry_env ]) @given('all files in gpAdminLogs directory are deleted') diff --git a/gpMgmt/test/behave_utils/gpfdist_utils/gpfdist_mgmt.py b/gpMgmt/test/behave_utils/gpfdist_utils/gpfdist_mgmt.py index fd1626443ff..6cd502aa5a9 100755 --- a/gpMgmt/test/behave_utils/gpfdist_utils/gpfdist_mgmt.py +++ b/gpMgmt/test/behave_utils/gpfdist_utils/gpfdist_mgmt.py @@ -5,7 +5,7 @@ from gppylib.commands.base import Command, LOCAL, REMOTE, WorkerPool except ImportError as import_exception: sys.exit('Cannot import modules. Please check that you have sourced' \ - ' greenplum_path.sh. Detail: %s' % str(import_exception)) + ' cloudberry-env.sh. Detail: %s' % str(import_exception)) import socket class Gpfdist: @@ -13,7 +13,7 @@ class Gpfdist: Gpfdist class to management create and cleanup of gpfdist instance """ def __init__(self, name, directory, port, pid_file, - ctxt=LOCAL, remoteHost=None, remote_source_file=os.path.join(os.environ.get('GPHOME'),'greenplum_path.sh')): + ctxt=LOCAL, remoteHost=None, remote_source_file=os.path.join(os.environ.get('GPHOME'),'cloudberry-env.sh')): """ name: name of the command dir: directory for gpfdist to use as its root directory diff --git a/gpMgmt/test/behave_utils/utils.py b/gpMgmt/test/behave_utils/utils.py index a61febcd9f7..bc62c15badf 100644 --- a/gpMgmt/test/behave_utils/utils.py +++ b/gpMgmt/test/behave_utils/utils.py @@ -231,7 +231,7 @@ def stop_primary(context, content_id): # For demo_cluster tests that run on the CI gives the error 'bash: pg_ctl: command not found' # Thus, need to add pg_ctl to the path when ssh'ing to a demo cluster. subprocess.check_call(['ssh', seg_host, - 'source %s/greenplum_path.sh && pg_ctl stop -m fast -D %s' % ( + 'source %s/cloudberry-env.sh && pg_ctl stop -m fast -D %s' % ( pipes.quote(os.environ.get("GPHOME")), pipes.quote(seg_data_dir)) ]) diff --git a/gpcontrib/gpmapreduce/input/mapred.source b/gpcontrib/gpmapreduce/input/mapred.source index 7702abc2951..d885c974447 100644 --- a/gpcontrib/gpmapreduce/input/mapred.source +++ b/gpcontrib/gpmapreduce/input/mapred.source @@ -26,7 +26,7 @@ create language plpython3u; select * from pg_pltemplate; select lanname, lanispl, lanpltrusted from pg_language; --- Check environment variables that should have been set by greenplum_path.sh +-- Check environment variables that should have been set by cloudberry-env.sh -- -- 1) We need to check these on all segments and on the master. -- 2) We do this via external table rather than perl/python in case it is part diff --git a/gpcontrib/gpmapreduce/output/mapred.source b/gpcontrib/gpmapreduce/output/mapred.source index 0f0779a6656..66c9f8c6e07 100644 --- a/gpcontrib/gpmapreduce/output/mapred.source +++ b/gpcontrib/gpmapreduce/output/mapred.source @@ -42,7 +42,7 @@ select lanname, lanispl, lanpltrusted from pg_language; plpython3u | t | f (6 rows) --- Check environment variables that should have been set by greenplum_path.sh +-- Check environment variables that should have been set by cloudberry-env.sh -- -- 1) We need to check these on all segments and on the master. -- 2) We do this via external table rather than perl/python in case it is part diff --git a/pom.xml b/pom.xml index 5947cdbe45f..8b95a4b8c93 100644 --- a/pom.xml +++ b/pom.xml @@ -301,7 +301,7 @@ code or new licensing patterns. gpMgmt/bin/gpsync gpMgmt/bin/gpssh-exkeys - gpMgmt/bin/generate-greenplum-path.sh + gpMgmt/bin/generate-cloudberry-env.sh gpMgmt/bin/ifaddrs/Makefile gpMgmt/bin/ifaddrs/main.c gpMgmt/Makefile @@ -601,8 +601,8 @@ code or new licensing patterns. gpAux/client/install/src/windows/CreatePackage.bat gpAux/client/install/src/windows/CopyDependencies.bat gpAux/client/install/src/windows/license.rtf - gpAux/client/scripts/greenplum_clients_path.sh - gpAux/client/scripts/greenplum_clients_path.bat + gpAux/client/scripts/cloudberry_clients_path.sh + gpAux/client/scripts/cloudberry_clients_path.bat doc/** diff --git a/src/backend/gporca/scripts/cal_bitmap_test.py b/src/backend/gporca/scripts/cal_bitmap_test.py index c404924bcfb..3c54848cb4a 100755 --- a/src/backend/gporca/scripts/cal_bitmap_test.py +++ b/src/backend/gporca/scripts/cal_bitmap_test.py @@ -32,7 +32,7 @@ try: from gppylib.db import dbconn except ImportError as e: - sys.exit('ERROR: Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(e)) + sys.exit('ERROR: Cannot import modules. Please check that you have sourced cloudberry-env.sh. Detail: ' + str(e)) # constants # ----------------------------------------------------------------------------- diff --git a/src/backend/gporca/scripts/get_debug_event_counters.py b/src/backend/gporca/scripts/get_debug_event_counters.py index 41a5b0ea410..aaa22b0f4ec 100755 --- a/src/backend/gporca/scripts/get_debug_event_counters.py +++ b/src/backend/gporca/scripts/get_debug_event_counters.py @@ -28,7 +28,7 @@ try: from gppylib.db import dbconn except ImportError, e: - sys.exit('ERROR: Cannot import modules. Please check that you have sourced greenplum_path.sh to set PYTHONPATH. ' + sys.exit('ERROR: Cannot import modules. Please check that you have sourced cloudberry-env.sh to set PYTHONPATH. ' 'Detail: ' + str(e)) glob_use_sql = False diff --git a/src/bin/gpfdist/README b/src/bin/gpfdist/README index 1e35d24a385..21aadf349bf 100644 --- a/src/bin/gpfdist/README +++ b/src/bin/gpfdist/README @@ -4,7 +4,7 @@ See gpdb-doc/dita/utility_guide/admin_utilities/gpfdist.xml Compiling ------------- -## Do not source greenplum_path.sh (although you can find $GPHOME in there) +## Do not source cloudberry-env.sh (although you can find $GPHOME in there) ./configure --enable-transformations --prefix= make make install diff --git a/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_ssl_not_matching.bat b/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_ssl_not_matching.bat index 696791f1015..f761ce7c883 100644 --- a/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_ssl_not_matching.bat +++ b/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_ssl_not_matching.bat @@ -1,2 +1,2 @@ -call "C:\Program Files\Cloudberry\greenplum-clients\greenplum_clients_path.bat" +call "C:\Program Files\Cloudberry\greenplum-clients\cloudberry_clients_path.bat" gpfdist -p 7070 -d .\ --ssl gpfdist_ssl\certs_not_matching diff --git a/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_with_ssl.bat b/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_with_ssl.bat index 2c75d07330f..201e1a3dd86 100644 --- a/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_with_ssl.bat +++ b/src/bin/gpfdist/remote_regress/start_gpfdist_remote_win/start_gpfdist_with_ssl.bat @@ -1,3 +1,3 @@ -call "C:\Program Files\Cloudberry\greenplum-clients\greenplum_clients_path.bat" +call "C:\Program Files\Cloudberry\greenplum-clients\cloudberry_clients_path.bat" del gpfdist_ssl\tbl2.tbl gpfdist -p 7070 -d .\ --ssl gpfdist_ssl\certs_matching diff --git a/src/bin/pg_upgrade/test_gpdb.sh b/src/bin/pg_upgrade/test_gpdb.sh index 5c770240aa7..d5cecff8108 100755 --- a/src/bin/pg_upgrade/test_gpdb.sh +++ b/src/bin/pg_upgrade/test_gpdb.sh @@ -368,7 +368,7 @@ main() { ########################## START: OLD cluster checks - . ${OLD_BINDIR}/../greenplum_path.sh + . ${OLD_BINDIR}/../cloudberry-env.sh # The cluster should be running by now, but in case it isn't, issue a restart. # Since we expect the testcluster to be a stock standard gpdemo, we test for @@ -419,7 +419,7 @@ main() { ########################## START: NEW cluster creation echo "Switching to gpdb-6 env..." - . ${NEW_BINDIR}/../greenplum_path.sh + . ${NEW_BINDIR}/../cloudberry-env.sh # Create a new gpdemo cluster in the NEW_DATADIR. Using the new datadir for the # path to demo_cluster.sh is a bit of a hack, but since this test relies on @@ -492,7 +492,7 @@ main() { print_delta_seconds $epoch_for_perf_start 'number_of_seconds_for_upgrade' - . ${NEW_BINDIR}/../greenplum_path.sh + . ${NEW_BINDIR}/../cloudberry-env.sh if (( !$perf_test )) ; then diff_and_exit diff --git a/src/test/binary_swap/test_binary_swap.sh b/src/test/binary_swap/test_binary_swap.sh index 3ed0f59eb72..3011a57a7a2 100755 --- a/src/test/binary_swap/test_binary_swap.sh +++ b/src/test/binary_swap/test_binary_swap.sh @@ -40,7 +40,7 @@ start_binary() { BINARY_PATH=$1 gpstop -ai - source $BINARY_PATH/greenplum_path.sh + source $BINARY_PATH/cloudberry-env.sh gpstart -a echo "Select our Cloudberry version just to be sure..." psql -c "select version()" postgres @@ -89,12 +89,12 @@ GPHOME_CURRENT=${GPHOME_CURRENT:=$GPHOME} MDD_CURRENT=${MDD_CURRENT:=$MASTER_DATA_DIRECTORY} PGPORT_CURRENT=${PGPORT_CURRENT:=$PGPORT} -if [ "${GPHOME_OTHER}x" == "x" ] || ! [ -f $GPHOME_OTHER/greenplum_path.sh ]; then +if [ "${GPHOME_OTHER}x" == "x" ] || ! [ -f $GPHOME_OTHER/cloudberry-env.sh ]; then echo "Use -b to provide a valid Cloudberry install path to upgrade/downgrade from" exit 1 fi -if [ "${GPHOME_CURRENT}x" == "x" ] || ! [ -f $GPHOME_CURRENT/greenplum_path.sh ]; then +if [ "${GPHOME_CURRENT}x" == "x" ] || ! [ -f $GPHOME_CURRENT/cloudberry-env.sh ]; then echo "Use -c to provide a valid Cloudberry install path to upgrade/downgrade to (Default: \$GPHOME)" exit 1 fi @@ -138,14 +138,14 @@ run_tests schedule1${VARIANT} ## Change the binary, dump, and then compare the two dumps generated ## by both binaries. Then we do some inserts and dump again. We source -## $GPHOME_CURRENT/greenplum_path.sh here after starting Cloudberry +## $GPHOME_CURRENT/cloudberry-env.sh here after starting Cloudberry ## with $GPHOME_OTHER to use latest pg_dumpall to prevent catching ## diffs due to changes made to pg_dump. The running binaries are ## still from $GPHOME_OTHER. Only pg_regress, pg_dumpall, psql, and ## gpcheckcat should be from $GPHOME_CURRENT during the pg_regress ## test. start_binary $GPHOME_OTHER -source $GPHOME_CURRENT/greenplum_path.sh +source $GPHOME_CURRENT/cloudberry-env.sh run_tests schedule2${VARIANT} ## Change the binary back, dump, and then compare the two new dumps diff --git a/src/test/isolation2/expected/segwalrep/select_throttle.out b/src/test/isolation2/expected/segwalrep/select_throttle.out index 1d722085938..5a072cf5674 100644 --- a/src/test/isolation2/expected/segwalrep/select_throttle.out +++ b/src/test/isolation2/expected/segwalrep/select_throttle.out @@ -275,7 +275,7 @@ SELECT pg_reload_conf(); 20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Adding cmd to work_queue: $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1 20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] got cmd: $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1 20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Running Command: $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1 -20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: run pg_controldata cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/greenplum_path.sh; $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1"' had result: cmd had rc=0 completed=True halted=False +20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: run pg_controldata cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/cloudberry-env.sh; $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1"' had result: cmd had rc=0 completed=True halted=False stdout='pg_control version number: 12010700 Catalog version number: 302304041 Database system identifier: 7227176750494621446 @@ -333,7 +333,7 @@ Mock authentication nonce: e3a5af22bfbe2ac44c969f4724f7c7a50599226317 stderr='' 20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] got cmd: $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1 20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Running Command: $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1 -20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: run pg_controldata cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/greenplum_path.sh; $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1"' had result: cmd had rc=0 completed=True halted=False +20230428:13:32:54:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: run pg_controldata cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/cloudberry-env.sh; $GPHOME/bin/pg_controldata /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1"' had result: cmd had rc=0 completed=True halted=False stdout='pg_control version number: 12010700 Catalog version number: 302304041 Database system identifier: 7227176750494621446 @@ -603,7 +603,7 @@ host replication pivotal 2601:647:4800:c740:3259:5e67:ae0d:643f/128 trust host replication pivotal 2601:647:4800:c740:7cd8:f44e:3889:509e/128 trust host replication pivotal 2601:647:4800:c740:40d4:7879:8a:dc04/128 trust host replication pivotal 2601:647:4800:c740:c21a:83b2:8a4a:33bd/128 trust' -20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: Update pg_hba.conf cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/greenplum_path.sh; $GPHOME/sbin/seg_update_pg_hba.py --data-dir /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1 --entries ' +20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: Update pg_hba.conf cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/cloudberry-env.sh; $GPHOME/sbin/seg_update_pg_hba.py --data-dir /home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1 --entries ' host replication pivotal samehost trust host all pivotal 10.0.0.234/32 trust host all pivotal 172.17.0.1/32 trust @@ -644,7 +644,7 @@ host replication pivotal 2601:647:4800:c740:c21a:83b2:8a4a:33bd/128 trust'"' ha 20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Adding cmd to work_queue: $GPHOME/sbin/gpsegsetuprecovery.py -c '[{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite 20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] got cmd: $GPHOME/sbin/gpsegsetuprecovery.py -c '[{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite 20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Running Command: $GPHOME/sbin/gpsegsetuprecovery.py -c '[{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite -20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: Run validation checks and setup data directories for recovery cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/greenplum_path.sh; $GPHOME/sbin/gpsegsetuprecovery.py -c '[{\"target_datadir\": \"/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1\", \"target_port\": 7006, \"target_segment_dbid\": 6, \"source_hostname\": \"station6\", \"source_port\": 7003, \"is_full_recovery\": false, \"progress_file\": \"/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out\"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite"' had result: cmd had rc=0 completed=True halted=False +20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker0] finished cmd: Run validation checks and setup data directories for recovery cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/cloudberry-env.sh; $GPHOME/sbin/gpsegsetuprecovery.py -c '[{\"target_datadir\": \"/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1\", \"target_port\": 7006, \"target_segment_dbid\": 6, \"source_hostname\": \"station6\", \"source_port\": 7003, \"is_full_recovery\": false, \"progress_file\": \"/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out\"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite"' had result: cmd had rc=0 completed=True halted=False stdout='20230428:13:32:55:1968258 gpsegsetuprecovery.py:station6:pivotal-[INFO]:-Starting recovery with args: -c [{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}] -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite 20230428:13:32:55:1968258 gpsegsetuprecovery.py:station6:pivotal-[DEBUG]:-WorkerPool() initialized with 1 workers 20230428:13:32:55:1968258 gpsegsetuprecovery.py:station6:pivotal-[DEBUG]:-Adding cmd to work_queue: @@ -691,7 +691,7 @@ host replication pivotal 2601:647:4800:c740:c21a:83b2:8a4a:33bd/128 trust'"' ha 20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Adding cmd to work_queue: $GPHOME/sbin/gpsegrecovery.py -c '[{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite --era=84f970d55cff544c_230428131001 20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker1] got cmd: $GPHOME/sbin/gpsegrecovery.py -c '[{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite --era=84f970d55cff544c_230428131001 20230428:13:32:55:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Running Command: $GPHOME/sbin/gpsegrecovery.py -c '[{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite --era=84f970d55cff544c_230428131001 -20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker1] finished cmd: Recover segments cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/greenplum_path.sh; $GPHOME/sbin/gpsegrecovery.py -c '[{\"target_datadir\": \"/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1\", \"target_port\": 7006, \"target_segment_dbid\": 6, \"source_hostname\": \"station6\", \"source_port\": 7003, \"is_full_recovery\": false, \"progress_file\": \"/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out\"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite --era=84f970d55cff544c_230428131001"' had result: cmd had rc=0 completed=True halted=False +20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker1] finished cmd: Recover segments cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/cloudberry-env.sh; $GPHOME/sbin/gpsegrecovery.py -c '[{\"target_datadir\": \"/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1\", \"target_port\": 7006, \"target_segment_dbid\": 6, \"source_hostname\": \"station6\", \"source_port\": 7003, \"is_full_recovery\": false, \"progress_file\": \"/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out\"}]' -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite --era=84f970d55cff544c_230428131001"' had result: cmd had rc=0 completed=True halted=False stdout='20230428:13:32:56:1968306 gpsegrecovery.py:station6:pivotal-[INFO]:-Starting recovery with args: -c [{"target_datadir": "/home/pivotal/workspace/gpdb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1", "target_port": 7006, "target_segment_dbid": 6, "source_hostname": "station6", "source_port": 7003, "is_full_recovery": false, "progress_file": "/home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"}] -l /home/pivotal/gpAdminLogs -v -b 64 --force-overwrite --era=84f970d55cff544c_230428131001 20230428:13:32:56:1968306 gpsegrecovery.py:station6:pivotal-[DEBUG]:-WorkerPool() initialized with 1 workers 20230428:13:32:56:1968306 gpsegrecovery.py:station6:pivotal-[DEBUG]:-Adding cmd to work_queue: @@ -717,7 +717,7 @@ station6 (dbid 6): skipping pg_rewind on mirror as standby.signal is present 20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Adding cmd to work_queue: rm -f /home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out 20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker2] got cmd: rm -f /home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out 20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-Running Command: rm -f /home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out -20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker2] finished cmd: remove file cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/greenplum_path.sh; rm -f /home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"' had result: cmd had rc=0 completed=True halted=False +20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[DEBUG]:-[worker2] finished cmd: remove file cmdStr='ssh -o StrictHostKeyChecking=no -o ServerAliveInterval=60 station6 ". /usr/local/gpdb/cloudberry-env.sh; rm -f /home/pivotal/gpAdminLogs/pg_rewind.20230428_133255.dbid6.out"' had result: cmd had rc=0 completed=True halted=False stdout='' stderr='' 20230428:13:32:56:1967876 gprecoverseg:station6:pivotal-[INFO]:-Triggering FTS probe diff --git a/src/test/regress/mem_quota_util.py b/src/test/regress/mem_quota_util.py index 6e38a380029..7d830530c24 100755 --- a/src/test/regress/mem_quota_util.py +++ b/src/test/regress/mem_quota_util.py @@ -17,7 +17,7 @@ from multiprocessing import Process from gppylib.commands import unix except Exception as e: - sys.exit('Cannot import modules. Please check that you have sourced greenplum_path.sh. Detail: ' + str(e)) + sys.exit('Cannot import modules. Please check that you have sourced cloudberry-env.sh. Detail: ' + str(e)) def parseargs( help=False ): parser = OptionParser()