X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Ftests%2Fsanity.sh;h=c7b40bf61f3723a84f35c6a5c44b4694240fc4e1;hp=b720668ade9601b776d92a8c0bda8e7fa260392c;hb=79c8abecdac052e3e00251547cc500f2cba742ab;hpb=dad25f258e50895b4bd5fce30765599a7a490aa0 diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh index b720668..c7b40bf 100755 --- a/lustre/tests/sanity.sh +++ b/lustre/tests/sanity.sh @@ -25120,8 +25120,18 @@ test_820() { # open intent should update default EA size # see mdc_update_max_ea_from_body() # notice this is the very first RPC to MDS2 - cp /etc/services $DIR/$tdir/mds2 || - error "Failed to copy files to mds$n" + out=$(cp /etc/services $DIR/$tdir/mds2 2>&1) + ret=$? + echo $out + # With SSK, this situation can lead to -EPERM being returned. + # In that case, simply retry. + if [ $ret -ne 0 ] && $SHARED_KEY; then + if echo "$out" | grep -q "not permitted"; then + cp /etc/services $DIR/$tdir/mds2 + ret=$? + fi + fi + [ $ret -eq 0 ] || error "Failed to copy files to mds$n" } run_test 820 "update max EA from open intent"