You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudberry.apache.org by ma...@apache.org on 2024/12/23 11:11:09 UTC
(cloudberry) 14/23: remove a superfluous variable (#13681)
This is an automated email from the ASF dual-hosted git repository.
maxyang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 11f5f19dc9206ce809146131fee358f45f1ea8f7
Author: Junwang Zhao <zh...@gmail.com>
AuthorDate: Sun Jun 19 16:43:40 2022 +0800
remove a superfluous variable (#13681)
Since LOG_MSG has a DISPLAY_TXT option, we should use it to
reduce introduction of new variable and remove duplicate
echo messages.
Signed-off-by: Junwang Zhao <zh...@gmail.com>
---
gpMgmt/bin/gpinitsystem | 7 ++-----
gpMgmt/bin/lib/gp_bash_functions.sh | 13 ++++---------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/gpMgmt/bin/gpinitsystem b/gpMgmt/bin/gpinitsystem
index 81bad01cbe..e59bab05ce 100755
--- a/gpMgmt/bin/gpinitsystem
+++ b/gpMgmt/bin/gpinitsystem
@@ -610,11 +610,8 @@ CHK_MULTI_HOME () {
PING_HOST $MHOST
SEG_HOSTNAME=$( REMOTE_EXECUTE_AND_GET_OUTPUT $MHOST "$HOSTNAME" )
if [ $? -ne 0 ];then
- LOG_MSG "[FATAL]:-Remote command to host $MHOST failed to get value of hostname"
- $ECHO "[FATAL]:-Remote command to host $MHOST failed to get value of hostname"
- LOG_MSG "[FATAL]:-Check to see that you have setup trusted remote ssh on all hosts"
- $ECHO "[FATAL]:-Check to see that you have setup trusted remote ssh on all hosts"
-
+ LOG_MSG "[FATAL]:-Remote command to host $MHOST failed to get value of hostname" 1
+ LOG_MSG "[FATAL]:-Check to see that you have setup trusted remote ssh on all hosts" 1
ERROR_EXIT "[FATAL]:-Unable to get hostname output for $MHOST"
fi
if [ `$ECHO ${T_SEG_ARRAY[@]}|$TR ' ' '\n'|$GREP -c "^${SEG_HOSTNAME}$"` -eq 0 ];then
diff --git a/gpMgmt/bin/lib/gp_bash_functions.sh b/gpMgmt/bin/lib/gp_bash_functions.sh
index c0c2439187..3b9a9de7b3 100755
--- a/gpMgmt/bin/lib/gp_bash_functions.sh
+++ b/gpMgmt/bin/lib/gp_bash_functions.sh
@@ -326,11 +326,9 @@ ERROR_EXIT () {
ERROR_CHK () {
LOG_MSG "[INFO]:-Start Function $FUNCNAME"
if [ $# -ne 3 ];then
- INITIAL_LEVEL=$DEBUG_LEVEL
- DEBUG_LEVEL=1
- LOG_MSG "[WARN]:-Incorrect # parameters supplied to $FUNCNAME"
- DEBUG_LEVEL=$INITIAL_LEVEL
- return;fi
+ LOG_MSG "[WARN]:-Incorrect # parameters supplied to $FUNCNAME" 1
+ return;
+ fi
RETVAL=$1;shift
MSG_TXT=$1;shift
ACTION=$1 #1=issue warn, 2=fatal
@@ -338,10 +336,7 @@ ERROR_CHK () {
LOG_MSG "[INFO]:-Successfully completed $MSG_TXT"
else
if [ $ACTION -eq 1 ];then
- INITIAL_LEVEL=$DEBUG_LEVEL
- DEBUG_LEVEL=1
- LOG_MSG "[WARN]:-Issue with $MSG_TXT"
- DEBUG_LEVEL=$INITIAL_LEVEL
+ LOG_MSG "[WARN]:-Issue with $MSG_TXT" 1
else
LOG_MSG "[INFO]:-End Function $FUNCNAME"
ERROR_EXIT "[FATAL]:-Failed to complete $MSG_TXT "
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org