diff --git a/inc/status.inc b/inc/status.inc index d2c5b4db..a35c26a6 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -28,26 +28,31 @@ STATUS(){ echo -en "${idsCL[LightCyan]}Setting up replication checks ... ${idsCL[Default]}" fi for NTYPE in "${ntypesel[@]}"; do - # REPLSTART ${NTYPE} & - PH=${NTYPE}_HOSTS[0] - if [ ! -f ${NM_FOLDER}/${!PH}.down ]; then - PH_CMD="ssh root@${!PH}" - var=${NTYPE}_REPL_CHECK[@] - if [ ! -z ${!var+x} ]; then - for rcheck in "${!var}"; do - ${PH_CMD} rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl - daterun=`date +%Y-%m-%d-%H-%M-%S` - ${PH_CMD} "echo -e \"Replcation-Test\n${daterun}\" > ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl" - ${PH_CMD} 'find ${NM_REPL_CHECK_LOC[${rcheck}]} -iname "*.sync-conflict-*" -exec rm {} \;' & - REPLCHECK "${rcheck}" "${nip}" "${PH_CMD}" "${ST_ACTION}" & >/dev/null 2>&1 - done - fi - fi + REPLSTART ${NTYPE} & done if [ "${ST_ACTION}" != "check" ]; then - echo -e "${idsCL[LightGreen]}Complete${idsCL[Default]}" - echo + echo -e "${idsCL[LightGreen]}Complete${idsCL[Default]}\n" + echo -en " ${idsCL[LightCyan]}Starting processes to collect/monitor replication check : " fi + for NTYPE in "${ntypesel[@]}"; do + PH=${NTYPE}_HOSTS[0] + PH_CMD="ssh root@${!PH}" + var=${NTYPE}_REPL_CHECK[@] + if [ ! -z ${!var+x} ]; then + var=${NTYPE}_HOSTS[@] + for nip in "${!var}"; do + if [[ "${RUN_NODE_IP}" != *"${nip}"* ]] && [ "${nip}" != "${!PH}" ]; then + if [ ! -f ${NM_FOLDER}/${!PH}.down ] && [ ! -f ${NM_TMPFOLDER}/${nip}.down ]; then + var2=${NTYPE}_REPL_CHECK[@] + for rcheck in "${!var2}"; do + REPLCHECK "${rcheck}" "${nip}" "${PH_CMD}" "${ST_ACTION}" & >/dev/null 2>&1 + done + fi + fi + done + fi + done + [ "${ST_ACTION}" != "check" ] && echo -e "${idsCL[Green]}Done${idsCL[Default]}\n" fi ######################## @@ -753,9 +758,8 @@ REPLSTART(){ for rcheck in "${!var}"; do ${PH_CMD} rm -f ${NM_FOLDER}/test.${STATUS_START//-/}.repl daterun=`date +%Y-%m-%d-%H-%M-%S` - ${PH_CMD} "echo -e \"Replcation-Test\n${daterun}\" > ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl" + ${PH_CMD} "echo -e \"Replcation-Test\n${daterun}\" > ${NM_REPL_CHECK_LOC[${rcheck}]}/test.${STATUS_START//-/}.repl" & ${PH_CMD} 'find ${NM_REPL_CHECK_LOC[${rcheck}]} -iname "*.sync-conflict-*" -exec rm {} \;' & - REPLCHECK "${rcheck}" "${nip}" "${PH_CMD}" "${ST_ACTION}" & >/dev/null 2>&1 done fi fi