Skip to content

Commit

Permalink
Doc: update the terminal info to CloudberryDB
Browse files Browse the repository at this point in the history 
To have a unified and smooth experience, update the terminal info to
CloudberryDB or Cloudberry Database, avoiding users' confusion.
  • Loading branch information
@tuhaihe
tuhaihe committed Dec 12, 2023
1 parent 5003448 commit 7826396
Show file tree
Hide file tree
Showing 23 changed files with 115 additions and 115 deletions.
8 changes: 4 additions & 4 deletions gpAux/gpdemo/demo_cluster.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ 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 " file in your Cloudberry installation directory."
echo " file in your CloudberryDB installation directory."
echo ""
exit 1
fi
Expand Down Expand Up @@ -214,17 +214,17 @@ GPPATH=`find -H $GPHOME -name gpstart| tail -1`
RETVAL=$?

if [ "$RETVAL" -ne 0 ]; then
echo "Error attempting to find Cloudberry executables in $GPHOME"
echo "Error attempting to find CloudberryDB executables in $GPHOME"
exit 1
fi

if [ ! -x "$GPPATH" ]; then
echo "No executables found for Cloudberry installation in $GPHOME"
echo "No executables found for CloudberryDB installation in $GPHOME"
exit 1
fi
GPPATH=`dirname $GPPATH`
if [ ! -x $GPPATH/gpinitsystem ]; then
echo "No mgmt executables(gpinitsystem) found for Cloudberry installation in $GPPATH"
echo "No mgmt executables(gpinitsystem) found for CloudberryDB installation in $GPPATH"
exit 1
fi

Expand Down
8 changes: 4 additions & 4 deletions gpMgmt/bin/gpactivatestandby
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ def print_results(array, hostname, options):
logger.info('to set this value.')
logger.info('COORDINATOR_PORT is now %d, if this has changed, you' % array.coordinator.getSegmentPort())
logger.info('may need to make additional configuration changes to allow access')
logger.info('to the Cloudberry instance.')
logger.info('to the CloudberryDB instance.')
logger.info('Refer to the Administrator Guide for instructions on how to re-activate')
logger.info('the coordinator to its previous state once it becomes available.')
logger.info('Query planner statistics must be updated on all databases')
Expand Down Expand Up @@ -302,14 +302,14 @@ def start_coordinator(options):
"""Starts the coordinator."""

logger.info('Starting standby coordinator database in utility mode...')
gp.NewGpStart.local('Start GPDB', coordinatorOnly=True, coordinatorDirectory=options.coordinator_data_dir)
gp.NewGpStart.local('Start CBDB', coordinatorOnly=True, coordinatorDirectory=options.coordinator_data_dir)

#-------------------------------------------------------------------------
def stop_coordinator():
"""Stops the coordinator."""

logger.info('Stopping standby coordinator...')
gp.GpStop.local('Stop GPDB', coordinatorOnly=True, fast=True)
gp.GpStop.local('Stop CBDB', coordinatorOnly=True, fast=True)

#-------------------------------------------------------------------------
def promote_standby(coordinator_data_dir):
Expand Down Expand Up @@ -381,7 +381,7 @@ try:
# If we forced to start utility coordinator, this is the time to restart
# cluster so that the new coordinator becomes dispatch mode.
if requires_restart:
cmd = gp.GpStop.local('GPDB restart', restart=True, datadir=options_.coordinator_data_dir)
cmd = gp.GpStop.local('CBDB restart', restart=True, datadir=options_.coordinator_data_dir)

# At this point, cancel isn't all that bad so re-enable
# keyboard interrupt.
Expand Down
24 changes: 12 additions & 12 deletions gpMgmt/bin/gpdeletesystem
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,19 +149,19 @@ def parseargs():
# -------------------------------------------------------------------------
def display_params(options, dburl, standby, segments, dumpDirsExist):
global g_warnings_generated
logger.info('Cloudberry Instance Deletion Parameters')
logger.info('CloudberryDB Instance Deletion Parameters')
logger.info('--------------------------------------')
logger.info('Cloudberry Coordinator hostname = %s' % dburl.pghost)
logger.info('Cloudberry Coordinator data directory = %s' % options.coordinator_data_dir)
logger.info('Cloudberry Coordinator port = %s' % dburl.pgport)
logger.info('CloudberryDB Coordinator hostname = %s' % dburl.pghost)
logger.info('CloudberryDB Coordinator data directory = %s' % options.coordinator_data_dir)
logger.info('CloudberryDB Coordinator port = %s' % dburl.pgport)
if standby:
logger.info('Cloudberry Coordinator standby host = %s' % standby.getSegmentHostName())
logger.info('Cloudberry Coordinator standby data directory = %s' % standby.getSegmentDataDirectory())
logger.info('Cloudberry Coordinator standby port = %s' % standby.getSegmentPort())
logger.info('CloudberryDB Coordinator standby host = %s' % standby.getSegmentHostName())
logger.info('CloudberryDB Coordinator standby data directory = %s' % standby.getSegmentDataDirectory())
logger.info('CloudberryDB Coordinator standby port = %s' % standby.getSegmentPort())
if options.force:
logger.info('Cloudberry Force delete of dump files = ON')
logger.info('CloudberryDB Force delete of dump files = ON')
else:
logger.info('Cloudberry Force delete of dump files = OFF')
logger.info('CloudberryDB Force delete of dump files = OFF')
logger.info('Batch size = %s' % options.batch_size)
logger.info('--------------------------------------')
logger.info(' Segment Instance List ')
Expand All @@ -173,14 +173,14 @@ def display_params(options, dburl, standby, segments, dumpDirsExist):
port = segdb.getSegmentPort()
logger.info('%s:%s:%s' % (host, datadir, port))

yn = ask_yesno('', 'Continue with Cloudberry instance deletion?', 'N')
yn = ask_yesno('', 'Continue with CloudberryDB instance deletion?', 'N')
if yn:
logger.info('FINAL WARNING, you are about to delete the Cloudberry instance')
logger.info('FINAL WARNING, you are about to delete the CloudberryDB instance')
logger.info('on coordinator host %s.' % dburl.pghost)
if dumpDirsExist and options.force:
logger.warn('There are database dump files, these will be DELETED if you continue!')
g_warnings_generated = True
yn = ask_yesno('', 'Continue with Cloudberry instance deletion?', 'N')
yn = ask_yesno('', 'Continue with CloudberryDB instance deletion?', 'N')
if not yn:
raise GpDeleteSystemException('User canceled')
else:
Expand Down
8 changes: 4 additions & 4 deletions gpMgmt/bin/gpexpand
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ DBNAME = 'postgres'
_gp_expand = None

description = ("""
Adds additional segments to a pre-existing GPDB Array.
Adds additional segments to a pre-existing CBDB Array.
""")

_help = ["""
Expand Down Expand Up @@ -571,7 +571,7 @@ class SegmentTemplateError(Exception): pass
# -------------------------------------------------------------------------
class SegmentTemplate:
"""Class for creating, distributing and deploying new segments to an
existing GPDB array"""
existing CBDB array"""

def __init__(self, logger, statusLogger, pool,
gparray, coordinatorDataDirectory,
Expand Down Expand Up @@ -2195,7 +2195,7 @@ def read_hosts_file(hosts_file):

def interview_setup(gparray, options):
help = """
System Expansion is used to add segments to an existing GPDB array.
System Expansion is used to add segments to an existing CBDB array.
gpexpand did not detect a System Expansion that is in progress.
Before initiating a System Expansion, you need to provision and burn-in
Expand Down Expand Up @@ -2397,7 +2397,7 @@ def main(options, args, parser):
gparray = GpArray.initFromCatalog(dburl, utility=True)
except DatabaseError as ex:
logger.error('Failed to connect to database. Make sure the')
logger.error('Cloudberry instance you wish to expand is running')
logger.error('CloudberryDB instance you wish to expand is running')
logger.error('and that your environment is correct, then rerun')
logger.error('gexpand ' + ' '.join(sys.argv[1:]))
sys.exit(1)
Expand Down
26 changes: 13 additions & 13 deletions gpMgmt/bin/gpinitstandby
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,14 +125,14 @@ def parseargs():
optgrp.add_option('-r', '--remove', action='store_true',
help='remove current warm coordinator standby. Use this option '
'if the warm coordinator standby host has failed. This option will '
'need to shutdown the GPDB array to be able to complete the request')
'need to shutdown the CBDB array to be able to complete the request')
optgrp.add_option('', '--hba-hostnames', action='store_true', dest='hba_hostnames',
help='use hostnames instead of CIDR in pg_hba.conf')

# XXX - This option is added to keep backward compatibility with DCA tools.
# But this option plays no role in the whole process, its a No-Op
optgrp.add_option('-M', '--mode', type='string', default='smart',
help='use specified mode when stopping the GPDB array. Default: smart')
help='use specified mode when stopping the CBDB array. Default: smart')
optgrp.add_option('-f', '--fts-host', type='string', dest='fts_host',
help='hostname of fts to configure hba configuration.')
parser.add_option_group(optgrp)
Expand Down Expand Up @@ -193,19 +193,19 @@ def print_summary(options, array, standby_datadir, unreachable_hosts=[]):
if options.remove:
logger.info('Warm coordinator standby removal parameters')
else:
logger.info('Cloudberry standby coordinator initialization parameters')
logger.info('CloudberryDB standby coordinator initialization parameters')
logger.info('-----------------------------------------------------')
logger.info('Cloudberry coordinator hostname = %s' \
logger.info('CloudberryDB coordinator hostname = %s' \
% array.coordinator.getSegmentHostName())
logger.info('Cloudberry coordinator data directory = %s' \
logger.info('CloudberryDB coordinator data directory = %s' \
% array.coordinator.getSegmentDataDirectory())
logger.info('Cloudberry coordinator port = %s' \
logger.info('CloudberryDB coordinator port = %s' \
% array.coordinator.getSegmentPort())
if options.remove:
logger.info('Cloudberry standby coordinator hostname = %s' \
logger.info('CloudberryDB standby coordinator hostname = %s' \
% array.standbyCoordinator.getSegmentHostName())
else:
logger.info('Cloudberry standby coordinator hostname = %s' \
logger.info('CloudberryDB standby coordinator hostname = %s' \
% options.standby_host)

if array.standbyCoordinator:
Expand All @@ -215,22 +215,22 @@ def print_summary(options, array, standby_datadir, unreachable_hosts=[]):
else:
standby_port = array.coordinator.getSegmentPort()

logger.info('Cloudberry standby coordinator port = %d' \
logger.info('CloudberryDB standby coordinator port = %d' \
% standby_port)

if array.standbyCoordinator:
logger.info('Cloudberry standby coordinator data directory = %s' \
logger.info('CloudberryDB standby coordinator data directory = %s' \
% array.standbyCoordinator.getSegmentDataDirectory())
else:
if standby_datadir:
logger.info('Cloudberry standby coordinator data directory = %s' % standby_datadir)
logger.info('CloudberryDB standby coordinator data directory = %s' % standby_datadir)
else:
raise GpInitStandbyException('No data directory specified for standby coordinator')

if not options.remove and options.no_update:
logger.info('Cloudberry update system catalog = Off')
logger.info('CloudberryDB update system catalog = Off')
elif not options.remove:
logger.info('Cloudberry update system catalog = On')
logger.info('CloudberryDB update system catalog = On')

# Confirm the action
if options.confirm:
Expand Down
Loading

0 comments on commit 7826396

Please sign in to comment.