This patch fixes stack_trap in conf-sanity test 110 and 111
to restore test environment.
Test-Parameters: trivial env=SLOW=yes,ENABLE_QUOTA=yes,CONF_SANITY_EXCEPT=107 \
clientdistro=el8.5 serverdistro=el8.5 testlist=conf-sanity
Test-Parameters: trivial env=SLOW=yes,ENABLE_QUOTA=yes \
fstype=zfs \
clientdistro=el8.5 serverdistro=el8.5 testlist=conf-sanity
Test-Parameters: trivial env=SLOW=yes,ENABLE_QUOTA=yes,CONF_SANITY_EXCEPT=107 \
mdscount=2 mdtcount=4 \
clientdistro=el8.5 serverdistro=el8.5 testlist=conf-sanity
Change-Id: I540d96e8ad2c4990e7da18fe22256b44e9a19c72
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/48022
Tested-by: jenkins <devops@whamcloud.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Arshad Hussain <arshad.hussain@aeoncomputing.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
local old_mdscount=$MDSCOUNT
local old_ostcount=$OSTCOUNT
local replace=""
- stack_trap "MDSCOUNT=$old_mdscount OSTCOUNT=$old_ostcount" EXIT
+ stack_trap "MDSCOUNT=$old_mdscount OSTCOUNT=$old_ostcount; reformat"
MDSCOUNT=1
OSTCOUNT=1
local old_ostcount=$OSTCOUNT
local old_mdssize=$MDSSIZE
local replace=""
- stack_trap "MDSSIZE=$MDSSIZE MDSCOUNT=$MDSCOUNT OSTCOUNT=$OSTCOUNT" EXIT
+ stack_trap "MDSSIZE=$old_mdssize MDSCOUNT=$old_mdscount \
+ OSTCOUNT=$old_ostcount; reformat"
MDSCOUNT=1
OSTCOUNT=1
(( MDSSIZE < 2400000 )) && MDSSIZE=2400000 # need at least 2.4GB
umount_client $MOUNT2 -f
cleanup
- (( $needskip )) && skip "ETA ${left}s after $num files / ${taken}s is too long"
+ ! (( $needskip )) ||
+ echo "ETA ${left}s after $num files / ${taken}s is too long"
run_e2fsck $(facet_active_host mds1) $(mdsdevname 1) -n
MDSCOUNT=$old_mdscount