diff options
| -rwxr-xr-x | perf-framework/create_gluster_vol | 17 | ||||
| -rwxr-xr-x | sanity/system_light/config | 2 | ||||
| -rwxr-xr-x | sanity/system_light/run.sh | 11 | ||||
| -rwxr-xr-x | sanity/system_light/scripts/fsx/fsx.sh | 1 |
4 files changed, 20 insertions, 11 deletions
diff --git a/perf-framework/create_gluster_vol b/perf-framework/create_gluster_vol index fcb91ce..ce4a29e 100755 --- a/perf-framework/create_gluster_vol +++ b/perf-framework/create_gluster_vol @@ -15,6 +15,10 @@ function mgmt_vol_create() for brick in $BRICK_IP_ADDRS do ssh -l root $MGMT_NODE "$GF_BIN/gluster peer probe $brick" + if [ $? -ne 0 ]; then + echo "cluster not set up properly. Please check & restart." + exit 255; + fi done ssh -l root $MGMT_NODE "$@" ssh -l root $MGMT_NODE "$GF_BIN/gluster volume start $VOLNAME" @@ -45,22 +49,23 @@ function cleanup_brick() echo "Cleaning bricks..." for brick in $BRICK_IP_ADDRS -do +do cleanup_brick $brick & done wait -echo "Creating export directory..." +echo "Creating export directory & flushing firewall rules." for brick in $BRICK_IP_ADDRS -do +do ssh -l root $brick "mkdir -p $SERVER_EXPORT_DIR" + ssh -l root $brick "iptables -F" done # Start glusterd on all the bricks echo "Starting glusterd..." for brick in $BRICK_IP_ADDRS -do +do if [ $ENABLE_MEM_ACCT == "yes" ] then ssh -l root $brick "GLUSTERFS_DISABLE_MEM_ACCT=0 $GF_BIN/glusterd" @@ -74,7 +79,7 @@ done bricklist="" count=0 for brick in $BRICK_IP_ADDRS -do +do bricklist+="$brick:$SERVER_EXPORT_DIR " count=$((count+1)) done @@ -109,7 +114,7 @@ sleep 5 if [ $ENABLE_MEM_ACCT == "yes" ] then for brick in $BRICK_IP_ADDRS - do + do echo "Memory accounting status on : $brick -" ssh -l root $brick "\ echo \"x/x &gf_mem_acct_enable\" > gf_gdb_commands;\ diff --git a/sanity/system_light/config b/sanity/system_light/config index 91422eb..0d95bcf 100755 --- a/sanity/system_light/config +++ b/sanity/system_light/config @@ -15,7 +15,7 @@ export DECISION="n" export TYPE="other" export TEST="all" -while getopts 'w:t:l:D' option +while getopts 'w:t:l:D:m' option do case $option in w) diff --git a/sanity/system_light/run.sh b/sanity/system_light/run.sh index 93852db..b8061c8 100755 --- a/sanity/system_light/run.sh +++ b/sanity/system_light/run.sh @@ -6,7 +6,10 @@ _init () set +x set -u; basedir=$(dirname $0); - SCRIPTS_PATH=$basedir/scripts; + name=$(basename $0); + abs=$(cd "$(dirname "$0")"; pwd) + SCRIPTS_PATH=$abs/scripts; + echo $abs; #SCRIPTS_PATH="/opt/qa/tools/system_light/scripts" CNT=0 . $basedir/config; @@ -35,17 +38,17 @@ function run_tests () CNT=$((CNT+1)) echo $CNT else - echo "$tool failed" + echo "$tool failed" | tee -a $TEST_FAIL echo $CNT fi return 0; else - echo "tool $tool is not there in the script directory. Exiting"; + echo "tool $tool is not there in the script directory $SCRIPTS_PATH. Exiting"; return 22; fi fi - for i in $(ls $SCRIPTS_PATH | sort -n) #grep "^[0-9]*$" | + for i in $(ls $SCRIPTS_PATH | sort -n) do if [ -f $SCRIPTS_PATH/$i/$i.sh ]; then run_tests $i; diff --git a/sanity/system_light/scripts/fsx/fsx.sh b/sanity/system_light/scripts/fsx/fsx.sh index 0d1a5e2..d76b5c4 100755 --- a/sanity/system_light/scripts/fsx/fsx.sh +++ b/sanity/system_light/scripts/fsx/fsx.sh @@ -8,6 +8,7 @@ function main () return 0; else return 1; + fi } main "$@";
\ No newline at end of file |