X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fobdfilter-survey.sh;h=23e2156fedab0af539d06004f7701af0cc74b2e2;hp=5058fa7246fe7152eeea8f5ff7aa3f40bd86f2c6;hb=56f69854dae234fa974ab4f1dff909aea601a592;hpb=265d247c0199b3a914cd1f286ca99eaeb98f08cd diff --git a/lustre/tests/obdfilter-survey.sh b/lustre/tests/obdfilter-survey.sh index 5058fa7..23e2156 100644 --- a/lustre/tests/obdfilter-survey.sh +++ b/lustre/tests/obdfilter-survey.sh @@ -1,29 +1,25 @@ #!/bin/bash -#set -x set -e -LUSTRE=${LUSTRE:-`dirname $0`/..} +LUSTRE=${LUSTRE:-$(dirname $0)/..} . $LUSTRE/tests/test-framework.sh init_test_env $@ +init_logging -nobjhi=${nobjhi:-1} -thrhi=${thrhi:-16} -size=${size:-1024} +# bug number for skipped test: +ALWAYS_EXCEPT="$OBDFILTER_SURVEY_EXCEPT " +# UPDATE THE COMMENT ABOVE WITH BUG NUMBERS WHEN CHANGING ALWAYS_EXCEPT! -# the summary file a bit smaller than OSTSIZE -. ${CONFIG:=$LUSTRE/tests/cfg/$NAME.sh} -init_logging +build_test_filter [ "$SLOW" = no ] && { nobjhi=1; thrhi=4; } +nobjhi=${nobjhi:-1} +thrhi=${thrhi:-16} +size=${size:-1024} thrlo=${thrlo:-$(( thrhi / 2))} -# Skip these tests -# bug number 23791 23791 -ALWAYS_EXCEPT="1b 2b $OBDFILTER_SURVEY_EXCEPT" - OBDSURVEY=${OBDSURVEY:-$(which obdfilter-survey)} -build_test_filter check_and_setup_lustre # FIXME: the summary file a bit smaller than OSTSIZE, add estimation @@ -33,28 +29,28 @@ if [ $(( size * 1024 )) -ge $minsize ]; then echo min kbytesavail: $minsize using size=${size} MBytes per obd instance fi -get_devs() { - echo $(do_nodes $1 'lctl dl | grep obdfilter' | \ - awk '{print $4}' | sort -u) -} - get_targets () { - local targets - local devs - local nid - local oss - - for oss in $(osts_nodes); do - devs=$(get_devs $oss) - nid=$(host_nids_address $oss $NETTYPE) - for d in $devs; do - # if oss is local -- obdfilter-survey needs dev wo/ host - target=$d - [[ $oss = `hostname` && "$1" == "netdisk" ]] || target=$nid:$target - targets="$targets $target" - done - done - + local targets + local target + local dev + local nid + local osc + + for osc in $($LCTL get_param -N osc.${FSNAME}-*osc-*); do + nid=$($LCTL get_param $osc.import | + awk '/current_connection:/ {sub(/@.*/,""); print $2}') + dev=$(echo $osc | sed -e 's/^osc\.//' -e 's/-osc.*//') + target=$dev + + # For local disk obdfilter-survey requires target devs w/o nid. + # obdfilter-survey : + # case 1 (local disk): + # $ nobjhi=2 thrhi=2 size=1024 + # targets="$nid:$FSNAME-OST0000 $nid:$FSNAME-OST0001 ..." + # ./obdfilter-survey + local_node && [ "$1" == "disk" ] || target=$nid:$target + targets="$targets $target" + done echo $targets } @@ -80,63 +76,17 @@ obdflter_survey_run () { local cmd="NETTYPE=$NETTYPE thrlo=$thrlo nobjhi=$nobjhi thrhi=$thrhi size=$size case=$case rslt_loc=${TMP} targets=\"$targets\" $OBDSURVEY" echo + $cmd eval $cmd + local rc=$? cat ${TMP}/obdfilter_survey* + [ $rc = 0 ] || error "$OBDSURVEY failed: $rc" } + test_1a () { obdflter_survey_run disk } run_test 1a "Object Storage Targets survey" -print_jbd () { - local file=$1 - local facet=$2 - local varsvc=${facet}_svc - local dev=$(ldiskfs_canon "*.${!varsvc}.mntdev" $facet) - - # ext4: /proc/fs/jbd2/sda1:8/history - # ext3: /proc/fs/jbd/sdb1/history - - do_facet $facet cat /proc/fs/jbd*/${dev}*/$file -} - -check_jbd_values () { - local facet=$1 - local thrhi=$2 - local rtime=$3 - - # last two lines from history - # $4: run >= 5000 - # $8: hndls >= thrhi * 2 - # display history of rtime/4 before, in case obd cleanup consumes time - local tlines=$((rtime / 5 / 4 + 1)) - local hist=("$(print_jbd history $facet | tail -$tlines | head -1)") - echo "$hist" - local run=($(echo "${hist[*]}" | awk '{print $4}')) - local hndls=($(echo "${hist[*]}" | awk '{print $8}')) - - local rc=0 - for (( i=0; i<1; i++)); do - [[ ${run[i]} -lt 5000 ]] && \ - error "$facet: run expected 5000, have ${run[i]}" && rc=1 - [[ ${hndls[i]} -lt $((thrhi * 2)) ]] && \ - error "$facet: hndls expected > $((thrhi * 2)), have ${hndls[i]}" && rc=2 - done - return $rc -} - -check_jbd_values_facets () { - local facets=$1 - local thrhi=$2 - local rtime=$3 - local facet - local rc=0 - for facet in ${facets//,/ }; do - check_jbd_values $facet $thrhi $rtime || rc=$((rc+$?)) - done - return $rc -} - test_1b () { local param_file=$TMP/$tfile-params @@ -154,17 +104,14 @@ test_1b () { local rtime=$((etime - stime)) echo "obd survey finished in $rtime seconds" - check_jbd_values_facets $(get_facets OST) 4 $rtime || rc=$((rc+$?)) - restore_lustre_params < $param_file rm -f $param_file - return $rc } run_test 1b "Object Storage Targets survey, async journal" test_1c () { - nobjlo=1 nobjhi=1 thrlo=128 thrhi=128 rszlo=1024 rszhi=1024 size=8192\ + nobjlo=1 nobjhi=1 thrlo=32 thrhi=32 rszlo=1024 rszhi=1024 size=8192\ obdflter_survey_run disk } run_test 1c "Object Storage Targets survey, big batch" @@ -190,22 +137,25 @@ test_2b () { local rtime=$((etime - stime)) echo "obd survey finished in $rtime seconds" - check_jbd_values_facets $(get_facets OST) 4 $rtime || rc=$((rc+$?)) - restore_lustre_params < $param_file rm -f $param_file - return $rc } run_test 2b "Stripe F/S over the Network, async journal" # README.obdfilter-survey: In network test only automated run is supported. test_3a () { - remote_servers || { skip "Local servers" && return 0; } + # obdfilter-survey Prerequisite: + # For "network" case you need to have all + # modules (those llmount.sh loads) loaded in kernel. And the + # 'lctl dl' output must be blank. + # Skipping test for CLIENTONLY mode because of + # cleanupall()->stopall() does not cleanup the servers on this mode. + [ "$CLIENTONLY" ] && skip "CLIENTONLY mode" + + remote_servers || skip "Local servers" - # The Network survey test needs: - # Start lctl and check for the device list. The device list must be empty. cleanupall obdflter_survey_run network