From: James Nunez Date: Tue, 11 Mar 2014 15:07:03 +0000 (-0600) Subject: LU-4747 tests: Call get_param from MDS X-Git-Tag: 2.5.58~57 X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=commitdiff_plain;h=117604e197d54e5a986facfcfc738afa290ad6c5 LU-4747 tests: Call get_param from MDS In sanity tests 120a, b, c, d, e, f and g, "lctl get_param ldlm.services.ldlm_canceld.stats" is called from the client, but these stats are only on the MDS. Adding do_facet to the MDS gets the necessary stats. Signed-off-by: James Nunez Change-Id: I6b8434960bf5ec5e1220460612a583f2ab763980 Reviewed-on: http://review.whamcloud.com/9581 Tested-by: Jenkins Reviewed-by: Andreas Dilger Tested-by: Maloo Reviewed-by: Jian Yu --- diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index 2e1d0b0..ff6a319 100644 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -1,5 +1,5 @@ #!/bin/bash -# -*- tab-width: 4; indent-tabs-mode: t; -*- +# -*- tab-width: 8; indent-tabs-mode: t; -*- # # Run select tests by setting ONLY, or as arguments to the script. # Skip specific tests by setting EXCEPT. @@ -7453,19 +7453,21 @@ test_120a() { cancel_lru_locks osc stat $DIR/$tdir > /dev/null - can1=$(lctl get_param -n ldlm.services.ldlm_canceld.stats | - awk '/ldlm_cancel/ {print $2}') - blk1=$(lctl get_param -n ldlm.services.ldlm_cbd.stats | - awk '/ldlm_bl_callback/ {print $2}') + can1=$(do_facet $SINGLEMDS \ + "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" | + awk '/ldlm_cancel/ {print $2}') + blk1=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats | + awk '/ldlm_bl_callback/ {print $2}') test_mkdir -c1 $DIR/$tdir/d1 - can2=$(lctl get_param -n ldlm.services.ldlm_canceld.stats | - awk '/ldlm_cancel/ {print $2}') - blk2=$(lctl get_param -n ldlm.services.ldlm_cbd.stats | - awk '/ldlm_bl_callback/ {print $2}') - [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured." - [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured." - lru_resize_enable mdc - lru_resize_enable osc + can2=$(do_facet $SINGLEMDS \ + "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" | + awk '/ldlm_cancel/ {print $2}') + blk2=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats | + awk '/ldlm_bl_callback/ {print $2}') + [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured." + [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured." + lru_resize_enable mdc + lru_resize_enable osc } run_test 120a "Early Lock Cancel: mkdir test" @@ -7478,15 +7480,21 @@ test_120b() { lru_resize_disable osc cancel_lru_locks mdc stat $DIR/$tdir > /dev/null - can1=`lctl get_param -n ldlm.services.ldlm_canceld.stats | awk '/ldlm_cancel/ {print $2}'` - blk1=`lctl get_param -n ldlm.services.ldlm_cbd.stats | awk '/ldlm_bl_callback/ {print $2}'` - touch $DIR/$tdir/f1 - can2=`lctl get_param -n ldlm.services.ldlm_canceld.stats | awk '/ldlm_cancel/ {print $2}'` - blk2=`lctl get_param -n ldlm.services.ldlm_cbd.stats | awk '/ldlm_bl_callback/ {print $2}'` - [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured." - [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured." - lru_resize_enable mdc - lru_resize_enable osc + can1=$(do_facet $SINGLEMDS \ + "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" | + awk '/ldlm_cancel/ {print $2}') + blk1=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats | + awk '/ldlm_bl_callback/ {print $2}') + touch $DIR/$tdir/f1 + can2=$(do_facet $SINGLEMDS \ + "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" | + awk '/ldlm_cancel/ {print $2}') + blk2=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats | + awk '/ldlm_bl_callback/ {print $2}') + [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured." + [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured." + lru_resize_enable mdc + lru_resize_enable osc } run_test 120b "Early Lock Cancel: create test" @@ -7499,18 +7507,24 @@ test_120c() { lru_resize_disable osc test_mkdir -p -c1 $DIR/$tdir/d1 test_mkdir -p -c1 $DIR/$tdir/d2 - touch $DIR/$tdir/d1/f1 - cancel_lru_locks mdc - stat $DIR/$tdir/d1 $DIR/$tdir/d2 $DIR/$tdir/d1/f1 > /dev/null - can1=`lctl get_param -n ldlm.services.ldlm_canceld.stats | awk '/ldlm_cancel/ {print $2}'` - blk1=`lctl get_param -n ldlm.services.ldlm_cbd.stats | awk '/ldlm_bl_callback/ {print $2}'` - ln $DIR/$tdir/d1/f1 $DIR/$tdir/d2/f2 - can2=`lctl get_param -n ldlm.services.ldlm_canceld.stats | awk '/ldlm_cancel/ {print $2}'` - blk2=`lctl get_param -n ldlm.services.ldlm_cbd.stats | awk '/ldlm_bl_callback/ {print $2}'` - [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured." - [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured." - lru_resize_enable mdc - lru_resize_enable osc + touch $DIR/$tdir/d1/f1 + cancel_lru_locks mdc + stat $DIR/$tdir/d1 $DIR/$tdir/d2 $DIR/$tdir/d1/f1 > /dev/null + can1=$(do_facet $SINGLEMDS \ + "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" | + awk '/ldlm_cancel/ {print $2}') + blk1=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats | + awk '/ldlm_bl_callback/ {print $2}') + ln $DIR/$tdir/d1/f1 $DIR/$tdir/d2/f2 + can2=$(do_facet $SINGLEMDS \ + "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" | + awk '/ldlm_cancel/ {print $2}') + blk2=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats | + awk '/ldlm_bl_callback/ {print $2}') + [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured." + [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured." + lru_resize_enable mdc + lru_resize_enable osc } run_test 120c "Early Lock Cancel: link test" @@ -7519,20 +7533,26 @@ test_120d() { test_mkdir -p -c1 $DIR/$tdir [ -z "$(lctl get_param -n mdc.*.connect_flags | grep early_lock_cancel)" ] && \ skip "no early lock cancel on server" && return 0 - lru_resize_disable mdc - lru_resize_disable osc - touch $DIR/$tdir - cancel_lru_locks mdc - stat $DIR/$tdir > /dev/null - can1=`lctl get_param -n ldlm.services.ldlm_canceld.stats | awk '/ldlm_cancel/ {print $2}'` - blk1=`lctl get_param -n ldlm.services.ldlm_cbd.stats | awk '/ldlm_bl_callback/ {print $2}'` - chmod a+x $DIR/$tdir - can2=`lctl get_param -n ldlm.services.ldlm_canceld.stats | awk '/ldlm_cancel/ {print $2}'` - blk2=`lctl get_param -n ldlm.services.ldlm_cbd.stats | awk '/ldlm_bl_callback/ {print $2}'` - [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured." - [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured." - lru_resize_enable mdc - lru_resize_enable osc + lru_resize_disable mdc + lru_resize_disable osc + touch $DIR/$tdir + cancel_lru_locks mdc + stat $DIR/$tdir > /dev/null + can1=$(do_facet $SINGLEMDS \ + "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" | + awk '/ldlm_cancel/ {print $2}') + blk1=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats | + awk '/ldlm_bl_callback/ {print $2}') + chmod a+x $DIR/$tdir + can2=$(do_facet $SINGLEMDS \ + "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" | + awk '/ldlm_cancel/ {print $2}') + blk2=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats | + awk '/ldlm_bl_callback/ {print $2}') + [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured." + [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured." + lru_resize_enable mdc + lru_resize_enable osc } run_test 120d "Early Lock Cancel: setattr test" @@ -7548,19 +7568,21 @@ test_120e() { cancel_lru_locks osc dd if=$DIR/$tdir/f1 of=/dev/null stat $DIR/$tdir $DIR/$tdir/f1 > /dev/null - can1=`lctl get_param -n ldlm.services.ldlm_canceld.stats | - awk '/ldlm_cancel/ {print $2}'` - blk1=`lctl get_param -n ldlm.services.ldlm_cbd.stats | - awk '/ldlm_bl_callback/ {print $2}'` - unlink $DIR/$tdir/f1 - can2=`lctl get_param -n ldlm.services.ldlm_canceld.stats | - awk '/ldlm_cancel/ {print $2}'` - blk2=`lctl get_param -n ldlm.services.ldlm_cbd.stats | - awk '/ldlm_bl_callback/ {print $2}'` - [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured." - [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured." - lru_resize_enable mdc - lru_resize_enable osc + can1=$(do_facet $SINGLEMDS \ + "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" | + awk '/ldlm_cancel/ {print $2}') + blk1=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats | + awk '/ldlm_bl_callback/ {print $2}') + unlink $DIR/$tdir/f1 + can2=$(do_facet $SINGLEMDS \ + "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" | + awk '/ldlm_cancel/ {print $2}') + blk2=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats | + awk '/ldlm_bl_callback/ {print $2}') + [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured." + [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured." + lru_resize_enable mdc + lru_resize_enable osc } run_test 120e "Early Lock Cancel: unlink test" @@ -7580,19 +7602,21 @@ test_120f() { dd if=$DIR/$tdir/d1/f1 of=/dev/null dd if=$DIR/$tdir/d2/f2 of=/dev/null stat $DIR/$tdir/d1 $DIR/$tdir/d2 $DIR/$tdir/d1/f1 $DIR/$tdir/d2/f2 > /dev/null - can1=`lctl get_param -n ldlm.services.ldlm_canceld.stats | - awk '/ldlm_cancel/ {print $2}'` - blk1=`lctl get_param -n ldlm.services.ldlm_cbd.stats | - awk '/ldlm_bl_callback/ {print $2}'` - mv $DIR/$tdir/d1/f1 $DIR/$tdir/d2/f2 - can2=`lctl get_param -n ldlm.services.ldlm_canceld.stats | - awk '/ldlm_cancel/ {print $2}'` - blk2=`lctl get_param -n ldlm.services.ldlm_cbd.stats | - awk '/ldlm_bl_callback/ {print $2}'` - [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured." - [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured." - lru_resize_enable mdc - lru_resize_enable osc + can1=$(do_facet $SINGLEMDS \ + "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" | + awk '/ldlm_cancel/ {print $2}') + blk1=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats | + awk '/ldlm_bl_callback/ {print $2}') + mv $DIR/$tdir/d1/f1 $DIR/$tdir/d2/f2 + can2=$(do_facet $SINGLEMDS \ + "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" | + awk '/ldlm_cancel/ {print $2}') + blk2=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats | + awk '/ldlm_bl_callback/ {print $2}') + [ $can1 -eq $can2 ] || error $((can2-can1)) "cancel RPC occured." + [ $blk1 -eq $blk2 ] || error $((blk2-blk1)) "blocking RPC occured." + lru_resize_enable mdc + lru_resize_enable osc } run_test 120f "Early Lock Cancel: rename test" @@ -7609,32 +7633,35 @@ test_120g() { cancel_lru_locks osc t0=`date +%s` - can0=`lctl get_param -n ldlm.services.ldlm_canceld.stats | - awk '/ldlm_cancel/ {print $2}'` - blk0=`lctl get_param -n ldlm.services.ldlm_cbd.stats | - awk '/ldlm_bl_callback/ {print $2}'` - createmany -o $DIR/$tdir/f $count - sync - can1=`lctl get_param -n ldlm.services.ldlm_canceld.stats | - awk '/ldlm_cancel/ {print $2}'` - blk1=`lctl get_param -n ldlm.services.ldlm_cbd.stats | - awk '/ldlm_bl_callback/ {print $2}'` - t1=`date +%s` - echo total: $((can1-can0)) cancels, $((blk1-blk0)) blockings - echo rm $count files - rm -r $DIR/$tdir - sync - can2=`lctl get_param -n ldlm.services.ldlm_canceld.stats | - awk '/ldlm_cancel/ {print $2}'` - blk2=`lctl get_param -n ldlm.services.ldlm_cbd.stats | - awk '/ldlm_bl_callback/ {print $2}'` - t2=`date +%s` - echo total: $count removes in $((t2-t1)) - echo total: $((can2-can1)) cancels, $((blk2-blk1)) blockings - sleep 2 - # wait for commitment of removal - lru_resize_enable mdc - lru_resize_enable osc + can0=$(do_facet $SINGLEMDS \ + "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" | + awk '/ldlm_cancel/ {print $2}') + blk0=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats | + awk '/ldlm_bl_callback/ {print $2}') + createmany -o $DIR/$tdir/f $count + sync + can1=$(do_facet $SINGLEMDS \ + "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" | + awk '/ldlm_cancel/ {print $2}') + blk1=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats | + awk '/ldlm_bl_callback/ {print $2}') + t1=$(date +%s) + echo total: $((can1-can0)) cancels, $((blk1-blk0)) blockings + echo rm $count files + rm -r $DIR/$tdir + sync + can2=$(do_facet $SINGLEMDS \ + "$LCTL get_param -n ldlm.services.ldlm_canceld.stats" | + awk '/ldlm_cancel/ {print $2}') + blk2=$($LCTL get_param -n ldlm.services.ldlm_cbd.stats | + awk '/ldlm_bl_callback/ {print $2}') + t2=$(date +%s) + echo total: $count removes in $((t2-t1)) + echo total: $((can2-can1)) cancels, $((blk2-blk1)) blockings + sleep 2 + # wait for commitment of removal + lru_resize_enable mdc + lru_resize_enable osc } run_test 120g "Early Lock Cancel: performance test"