From a4f957d6b8d98735af93450f556833f02e69f38e Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Tue, 12 Dec 2023 10:02:50 -0600 Subject: [PATCH] Update nodemgmt-scripts.sh --- nodemgmt-scripts.sh | 63 +++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index bf6602d0..d19e10d7 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -751,8 +751,7 @@ MAINTENANCE_MODE(){ srvcs=${NTYPE}_SERVICES_CHECK[@]; dockers=${NTYPE}_DOCKERS_CHECK[@] hosts=${NTYPE}_HOSTS[@] - - NTHOSTS=${NTYPE}_HOSTS[@] + repls=${NTYPE}_REPL_CHECK[@] if ([[ ! -v ${NTYPE}_DOCKERS_CHECK ]] && [ "${MM_ACTION}" == "dockers" ]) || ([ "${NM_SERVICES_CHECK[${NTYPE}]}" == "" ] && [ "${MM_ACTION}" == "services" ]); then GOFORCHECK=false; @@ -771,7 +770,7 @@ MAINTENANCE_MODE(){ fi DIVIDER . lightYellow; echo -en "${idsST[Reset]}" fi - for nip in "${!NTHOSTS}"; do + for nip in "${!hosts}"; do echo -e " ${idsST[Bold]}${idsCL[LightCyan]}${NM_HOSTNAMES[${nip}]} [${nip}]${idsST[Reset]}${idsCL[Default]}" DIVIDER false lightCyan @@ -812,37 +811,39 @@ MAINTENANCE_MODE(){ done fi - ######################## - ## REPLICATION CHECK - ######################## - - # if [ "${STATUS_ACTION}" == "repl" ] || [ "${STATUS_ACTION}" == "" ] || ([ "${STATUS_ACTION}" == "report" ] && [ ${REPLRUN} -eq 1 ]); then - # if [ "${MM_ACTION}" != "check" ]; then - # [ "${MM_ACTION}" == "" ] && [ "${NM_REPL_CHECK[${NTYPE}]}" != "" ] && echo - # echo -e "${idsCL[Green]} Replication Check(s)${idsCL[Default]}" - # DIVIDER . green 52 - # fi - # PH=${NTYPE}_HOSTS[0] - # PH_CMD="ssh root@${!PH}" - # var1=${NTYPE}_REPL_CHECK[@] - # if [ ! -z ${!var1+x} ]; then - # var2=${NTYPE}_HOSTS[@] - # for nip in "${!var2}"; do - # echo -e " ${idsCL[LightCyan]}${NM_HOSTNAMES[${!PH}]}[${!PH}] <--> ${idsST[Bold]}${NM_HOSTNAMES[${nip}]}[${nip}]${idsST[Reset]}${idsCL[Default]}" - # DIVIDER false green - # for rcheck in "${!var1}"; do - # # ic=0; cw=${PRI_CW}; spc=''; spc1=${cw}-${#NM_REPL_DESC[${rcheck}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done - # echo -en " ${NM_REPL_DESC[${rcheck}]}${spc}: " - # - # echo -e "${idsCL[LightGreen]}here${idsCL[Default]}" - # done - # echo - # done - # fi - # fi echo done + fi + + ######################## + ## REPLICATION CHECK + ######################## + + if [ "${STATUS_ACTION}" == "repl" ] || [ "${STATUS_ACTION}" == "" ] || ([ "${STATUS_ACTION}" == "report" ] && [ ${REPLRUN} -eq 1 ]); then + if [ "${MM_ACTION}" != "check" ]; then + [ "${MM_ACTION}" == "" ] && [ "${NM_REPL_CHECK[${NTYPE}]}" != "" ] && echo + echo -e "${idsCL[Green]} Replication Check(s)${idsCL[Default]}" + DIVIDER . green 52 + fi + PH=${NTYPE}_HOSTS[0] + PH_CMD="ssh root@${!PH}" + if [ ! -z ${!repls+x} ]; then + var2=${NTYPE}_HOSTS[@] + for nip in "${!hosts}"; do + echo -e " ${idsCL[LightCyan]}${NM_HOSTNAMES[${!PH}]}[${!PH}] <--> ${idsST[Bold]}${NM_HOSTNAMES[${nip}]}[${nip}]${idsST[Reset]}${idsCL[Default]}" + DIVIDER false green + for rcheck in "${!repls}"; do + # ic=0; cw=${PRI_CW}; spc=''; spc1=${cw}-${#NM_REPL_DESC[${rcheck}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + echo -en " ${NM_REPL_DESC[${rcheck}]}${spc}: " + + echo -e "${idsCL[LightGreen]}here${idsCL[Default]}" + done + echo + done + fi + fi + done }