LSTRIPE=${LSTRIPE:-"$LFS setstripe"}
LFIND=${LFIND:-"$LFS find"}
LVERIFY=${LVERIFY:-ll_dirstripe_verify}
-LSTRIPEINFO=${LSTRIPEINFO:-ll_getstripe_info}
LCTL=${LCTL:-lctl}
MCREATE=${MCREATE:-mcreate}
OPENFILE=${OPENFILE:-openfile}
}
check_kernel_version() {
- VERSION_FILE=version
WANT_VER=$1
- GOT_VER=$(lctl get_param -n $VERSION_FILE | awk '/kernel:/ {print $2}')
- [ $GOT_VER == "patchless" ] && return 0
- [ $GOT_VER -ge $WANT_VER ] && return 0
+ GOT_VER=$(lctl get_param -n version | awk '/kernel:/ {print $2}')
+ case $GOT_VER in
+ patchless|patchless_client) return 0;;
+ *) [ $GOT_VER -ge $WANT_VER ] && return 0 ;;
+ esac
log "test needs at least kernel version $WANT_VER, running $GOT_VER"
return 1
}
test_27w() { # bug 10997
mkdir -p $DIR/d27w || error "mkdir failed"
$LSTRIPE $DIR/d27w/f0 -s 65536 || error "lstripe failed"
- size=`$LSTRIPEINFO $DIR/d27w/f0 | awk {'print $1'}`
+ size=`$GETSTRIPE $DIR/d27w/f0 -qs`
[ $size -ne 65536 ] && error "stripe size $size != 65536" || true
[ "$OSTCOUNT" -lt "2" ] && skip "skipping multiple stripe count/offset test" && return
for i in `seq 1 $OSTCOUNT`; do
offset=$(($i-1))
$LSTRIPE $DIR/d27w/f$i -c $i -i $offset || error "lstripe -c $i -i $offset failed"
- count=`$LSTRIPEINFO $DIR/d27w/f$i | awk {'print $2'}`
- index=`$LSTRIPEINFO $DIR/d27w/f$i | awk {'print $3'}`
+ count=`$GETSTRIPE -qc $DIR/d27w/f$i`
+ index=`$GETSTRIPE -qo $DIR/d27w/f$i`
[ $count -ne $i ] && error "stripe count $count != $i" || true
[ $index -ne $offset ] && error "stripe offset $index != $offset" || true
done
echo "performing cp ..."
run_acl_subtest cp || error
echo "performing getfacl-noacl..."
- run_acl_subtest getfacl-noacl || error
+ run_acl_subtest getfacl-noacl || error "getfacl-noacl test failed"
echo "performing misc..."
- run_acl_subtest misc || error
+ run_acl_subtest misc || error "misc test failed"
echo "performing permissions..."
- run_acl_subtest permissions || error
+ run_acl_subtest permissions || error "permissions failed"
echo "performing setfacl..."
- run_acl_subtest setfacl || error
+ run_acl_subtest setfacl || error "setfacl test failed"
# inheritance test got from HP
echo "performing inheritance..."
- cp $LUSTRE/tests/acl/make-tree . || error
- chmod +x make-tree || error
- run_acl_subtest inheritance || error
+ cp $LUSTRE/tests/acl/make-tree . || error "cannot copy make-tree"
+ chmod +x make-tree || error "chmod +x failed"
+ run_acl_subtest inheritance || error "inheritance test failed"
rm -f make-tree
cd $SAVE_PWD
}
test_151() {
+ remote_ost_nodsh && skip "remote OST with nodsh" && return
+
local CPAGES=3
local list=$(comma_list $(osts_nodes))
test_200d() {
remote_mgs_nodsh && skip "remote MGS with nodsh" && return
- res=$($GETSTRIPE $POOL_DIR | grep pool: | cut -f8 -d " ")
- [ "$res" = $POOL ] || error "Pool on $POOL_DIR is not $POOL"
+ res=$($GETSTRIPE --pool $POOL_DIR | awk '/^pool:/ {print $2}')
+ [ "$res" = $POOL ] || error "Pool on $POOL_DIR is $res, not $POOL"
}
run_test 200d "Check pool on a directory ==============================="