@@ -248,7 +248,7 @@ validate_arg_type() {
248
248
exit 1
249
249
fi
250
250
elif [ $type = " word" ]; then
251
- re=' ^[a-zA-Z_ -]+$'
251
+ re=' ^[a-zA-Z0-9_ -]+$'
252
252
if ! [[ $value =~ $re ]]; then
253
253
err " '$name ' = '$value ' => is not a '$type ' (${re} )"
254
254
exit 1
@@ -436,7 +436,7 @@ usage() {
436
436
# additional info
437
437
echo >& ${out_descriptor}
438
438
echo " Example:" >& ${out_descriptor}
439
- echo " ./${SCRIPT_NAME} -h dev -p 5432 --username ${USER} --dbname postgres --project dummy" >& ${out_descriptor}
439
+ echo " PGPASSWORD=postgres ./${SCRIPT_NAME} -h dev -p 5432 --username ${USER} --dbname postgres --project dummy" >& ${out_descriptor}
440
440
echo >& ${out_descriptor}
441
441
echo " Add more checks into './resources/checks/' directory." >& ${out_descriptor}
442
442
echo >& ${out_descriptor}
@@ -676,7 +676,7 @@ check_bin_deps() {
676
676
# ######################################
677
677
# Check rights, set global variables, etc.
678
678
# Globals:
679
- # HOST, CHECK_HOST_CMD
679
+ # HOST, CHECK_HOST_CMD, NATIVE_HOSTNAME
680
680
# Arguments:
681
681
# None
682
682
# Returns:
@@ -685,12 +685,20 @@ check_bin_deps() {
685
685
host_pre_start_checks () {
686
686
# choise host connection command
687
687
# while checking ssh support
688
- if (ssh $HOST " true" > /dev/null 2>&1 ); then
688
+ # and determine NATIVE_HOSTNAME (a host key in JSON reports)
689
+ if NATIVE_HOSTNAME=$( ssh $HOST " hostname" 2> /dev/null) ; then
690
+ # ssh to remote host and use local psql (default)
689
691
export CHECK_HOST_CMD=" ssh ${HOST} "
690
692
else
693
+ NATIVE_HOSTNAME=" ${HOST} "
694
+ # swap ssh with bash
691
695
export CHECK_HOST_CMD=" bash -e -u -o pipefail -c"
696
+ # use local psql and connect to remote postgres without ssh
697
+ export _PSQL=" ${_PSQL} -h ${HOST} "
692
698
fi
693
- dbg " CHECK_HOST_CMD: ${CHECK_HOST_CMD} "
699
+ export NATIVE_HOSTNAME
700
+ dbg " CHECK_HOST_CMD: '${CHECK_HOST_CMD} '"
701
+ dbg " NATIVE_HOSTNAME: '$NATIVE_HOSTNAME '"
694
702
}
695
703
696
704
# ######################################
@@ -784,7 +792,6 @@ update_nodes_json() {
784
792
fi
785
793
786
794
export ALIAS_NAME ALIAS_INDEX ROLE EPOCH
787
- dbg " NATIVE_HOSTNAME: '$NATIVE_HOSTNAME '"
788
795
dbg " ALIAS_NAME: '$ALIAS_NAME '"
789
796
dbg " ALIAS_INDEX: '$ALIAS_INDEX '"
790
797
dbg " ROLE: '$ROLE '"
@@ -832,13 +839,6 @@ update_nodes_json() {
832
839
run_checks () {
833
840
# perform pre-checks here
834
841
835
- # get native hostname from remote host due to accurate
836
- # mapping in the future
837
- if ! NATIVE_HOSTNAME=" $( ${CHECK_HOST_CMD} " hostname" ) " ; then
838
- NATIVE_HOSTNAME=" $HOST "
839
- fi
840
- export NATIVE_HOSTNAME
841
-
842
842
local pghrep_failed_jsons_stack=" "
843
843
844
844
# perform all checks from './resources/checks/' directory
0 commit comments