case $flavour in
block)
time=$(lfs quota -$qtype $qarg $parg $DIR|
- awk 'NR == 3{ print $5 }'| sed 's/s$//')
+ awk 'NR == 3{ print $5 }')
;;
file)
time=$(lfs quota -$qtype $qarg $DIR|
- awk 'NR == 3{ print $9 }'| sed 's/s$//')
+ awk 'NR == 3{ print $9 }')
;;
*)
error "Unknown quota type: $flavour"
;;
esac
+ local sleep_seconds=0
+ local orig_time=$time
+
+ echo "Grace time is $time"
# from lfs.c:__sec2str()
# const char spec[] = "smhdw";
# {1, 60, 60*60, 24*60*60, 7*24*60*60};
- [[ $time == *m* ]] && time=${time//m/} && time=$((time*60));
- [[ $time == *h* ]] && time=${time//h/} && time=$((time*60*60));
- [[ $time == *d* ]] && time=${time//d/} && time=$((time*24*60*60));
- [[ $time == *w* ]] && time=${time//w/} && time=$((time*7*24*60*60));
+ [[ $time == *w* ]] && w_time=${time%w*} &&
+ let sleep_seconds+=$((w_time*7*24*60*60));
+ time=${time#*w}
+ [[ $time == *d* ]] && d_time=${time%d*} &&
+ let sleep_seconds+=$((d_time*24*60*60));
+ time=${time#*d}
+ [[ $time == *h* ]] && h_time=${time%h*} &&
+ let sleep_seconds+=$((h_time*60*60));
+ time=${time#*h}
+ [[ $time == *m* ]] && m_time=${time%m*} &&
+ let sleep_seconds+=$((m_time*60));
+ time=${time#*m}
+ [[ $time == *s* ]] && s_time=${time%s*} &&
+ let sleep_seconds+=$s_time
echo "Sleep through grace ..."
- [ "$time" == "-" ] &&
+ [ "$orig_time" == "-" ] &&
error "Grace timeout was not set or quota not exceeded"
- if [ "$time" == "none" ]; then
+ if [ "$orig_time" == "none" ]; then
echo "...Grace timeout already expired"
else
- let time+=$extrasleep
- echo "...sleep $time seconds"
- sleep $time
+ let sleep_seconds+=$extrasleep
+ echo "...sleep $sleep_seconds seconds"
+ sleep $sleep_seconds
fi
}
"user write success, but expect EDQUOT"
}
+check_write_fallocate() {
+ local testfile="$1"
+ local qtype="$2"
+ local limit=$3
+ local short_qtype=${qtype:0:1}
+
+ count=$((limit/2))
+ log "Write ${count}MiB Using Fallocate"
+ $RUNAS fallocate -l${count}MiB $testfile ||
+ quota_error $short_qtype $TSTUSR "Write ${count}MiB fail"
+
+ cancel_lru_locks osc
+ sync; sync_all_data || true
+ sleep 2
+
+ count=$((limit + 1))
+ log "Write ${count}MiB Using Fallocate"
+ $RUNAS fallocate -l${count}MiB $testfile &&
+ quota_error $short_qtype $TSTUSR \
+ "Write success, expect EDQUOT" || true
+}
+
# test block hardlimit
test_1a() {
local limit=10 # 10M
pool_add_targets $qpool 0 $(($OSTCOUNT - 1)) ||
error "pool_add_targets failed"
- $LFS setquota -u $TSTUSR -B ${limit}M -o $qpool $DIR ||
+ $LFS setquota -u $TSTUSR -B ${limit}M --pool $qpool $DIR ||
error "set user quota failed"
# make sure the system is clean
$LFS setquota -g $TSTUSR -b 0 -B ${global_limit}M -i 0 -I 0 $DIR ||
error "set group quota failed"
- $LFS setquota -g $TSTUSR -b 0 -B ${limit}M -o $qpool $DIR ||
+ $LFS setquota -g $TSTUSR -b 0 -B ${limit}M --pool $qpool $DIR ||
error "set group quota failed"
testfile="$DIR/$tdir/$tfile-1"
$LFS setquota -p $TSTPRJID -b 0 -B ${global_limit}M -i 0 -I 0 $DIR ||
error "set project quota failed"
- $LFS setquota -p $TSTPRJID -b 0 -B ${limit}M -o $qpool $DIR ||
+ $LFS setquota -p $TSTPRJID -b 0 -B ${limit}M --pool $qpool $DIR ||
error "set project quota failed"
# create pools without hard limit
# initially such case raised several bugs
- $LFS setquota -u $TSTUSR -B 0M -o $qpool1 $DIR ||
+ $LFS setquota -u $TSTUSR -B 0M --pool $qpool1 $DIR ||
error "set user quota failed"
- $LFS setquota -u $TSTUSR -B 0M -o $qpool2 $DIR ||
+ $LFS setquota -u $TSTUSR -B 0M --pool $qpool2 $DIR ||
error "set user quota failed"
# make sure the system is clean
pool_add_targets $qpool2 0 $(($OSTCOUNT - 1)) ||
error "pool_add_targets failed"
- $LFS setquota -u $TSTUSR -B ${limit1}M -o $qpool1 $DIR ||
+ $LFS setquota -u $TSTUSR -B ${limit1}M --pool $qpool1 $DIR ||
error "set user quota failed"
- $LFS setquota -u $TSTUSR -B ${limit2}M -o $qpool2 $DIR ||
+ $LFS setquota -u $TSTUSR -B ${limit2}M --pool $qpool2 $DIR ||
error "set user quota failed"
# make sure the system is clean
pool_add_targets $qpool1 1 1 ||
error "pool_add_targets failed"
- $LFS setquota -u $TSTUSR -B ${limit1}M -o $qpool1 $DIR ||
+ $LFS setquota -u $TSTUSR -B ${limit1}M --pool $qpool1 $DIR ||
error "set user quota failed"
# make sure the system is clean
pool_add_targets $qpool1 0 0 ||
error "pool_add_targets failed"
- $LFS setquota -u $TSTUSR -B ${limit1}M -o $qpool1 $DIR ||
+ $LFS setquota -u $TSTUSR -B ${limit1}M --pool $qpool1 $DIR ||
error "set user quota failed"
# make sure the system is clean
run_test 1f "Quota pools: correct qunit after removing/adding OST"
test_1g() {
- local limit=10 # 10M
- local global_limit=20 # 20M
+ local limit=20 # 20M
+ local global_limit=40 # 40M
local testfile="$DIR/$tdir/$tfile-0"
local qpool="qpool1"
local mdmb_param="osc.*.max_dirty_mb"
pool_add_targets $qpool 0 $(($OSTCOUNT - 1)) ||
error "pool_add_targets failed"
- $LFS setquota -u $TSTUSR -B ${limit}M -o $qpool $DIR ||
+ $LFS setquota -u $TSTUSR -B ${limit}M --pool $qpool $DIR ||
error "set user quota failed"
# make sure the system is clean
}
run_test 1g "Quota pools: Block hard limit with wide striping"
+test_1h() {
+ local limit=10 # 10M
+ local testfile="$DIR/$tdir/$tfile-0"
+
+ check_set_fallocate_or_skip
+
+ setup_quota_test || error "setup quota failed with $?"
+ trap cleanup_quota_test EXIT
+
+ # enable ost quota
+ set_ost_qtype $QTYPE || error "enable ost quota failed"
+
+ # test for user
+ log "User quota (block hardlimit:$limit MB)"
+ $LFS setquota -u $TSTUSR -b 0 -B ${limit}M -i 0 -I 0 $DIR ||
+ error "set user quota failed"
+
+ # make sure the system is clean
+ local used=$(getquota -u $TSTUSR global curspace)
+ [ $used -ne 0 ] && error "Used space($used) for user $TSTUSR isn't 0."
+
+ $LFS setstripe $testfile -c 1 || error "setstripe $testfile failed"
+ chown $TSTUSR.$TSTUSR $testfile || error "chown $testfile failed"
+
+ check_write_fallocate $testfile "user" $limit
+
+ rm -f $testfile
+ wait_delete_completed || error "wait_delete_completed failed"
+ sync_all_data || true
+ used=$(getquota -u $TSTUSR global curspace)
+ [ $used -ne 0 ] && quota_error u $TSTUSR \
+ "user quota isn't released after deletion"
+ resetquota -u $TSTUSR
+}
+run_test 1h "Block hard limit test using fallocate"
+
# test inode hardlimit
test_2() {
local TESTFILE="$DIR/$tdir/$tfile-0"
$LFS setquota -t -u --block-grace $glbl_grace --inode-grace \
$MAX_IQ_TIME $DIR || error "set user grace time failed"
$LFS setquota -t -u --block-grace $grace \
- -o $qpool $DIR || error "set user grace time failed"
+ --pool $qpool $DIR || error "set user grace time failed"
$LFS setquota -u $TSTUSR -b ${glbl_limit}M -B 0 -i 0 -I 0 $DIR ||
error "set user quota failed"
- $LFS setquota -u $TSTUSR -b ${limit}M -B 0 -o $qpool $DIR ||
+ $LFS setquota -u $TSTUSR -b ${limit}M -B 0 --pool $qpool $DIR ||
error "set user quota failed"
test_block_soft $testfile $grace $limit "u" $qpool
$LFS setquota -t -g --block-grace $glbl_grace --inode-grace \
$MAX_IQ_TIME $DIR || error "set group grace time failed"
$LFS setquota -t -g --block-grace $grace \
- -o $qpool $DIR || error "set group grace time failed"
+ --pool $qpool $DIR || error "set group grace time failed"
$LFS setquota -g $TSTUSR -b ${glbl_limit}M -B 0 -i 0 -I 0 $DIR ||
error "set group quota failed"
- $LFS setquota -g $TSTUSR -b ${limit}M -B 0 -o $qpool $DIR ||
+ $LFS setquota -g $TSTUSR -b ${limit}M -B 0 --pool $qpool $DIR ||
error "set group quota failed"
test_block_soft $testfile $grace $limit "g" $qpool
$MAX_IQ_TIME $DIR ||
error "set project grace time failed"
$LFS setquota -t -p --block-grace $grace \
- -o $qpool $DIR || error "set project grace time failed"
+ --pool $qpool $DIR ||
+ error "set project grace time failed"
$LFS setquota -p $TSTPRJID -b ${glbl_limit}M -B 0 -i 0 -I 0 \
$DIR || error "set project quota failed"
- $LFS setquota -p $TSTPRJID -b ${limit}M -B 0 -o $qpool $DIR ||
- error "set project quota failed"
+ $LFS setquota -p $TSTPRJID -b ${limit}M -B 0 \
+ --pool $qpool $DIR || error "set project quota failed"
test_block_soft $testfile $grace $limit "p" $qpool
resetquota -p $TSTPRJID
$LFS setquota -t -p --block-grace $MAX_DQ_TIME --inode-grace \
$MAX_IQ_TIME $DIR ||
error "restore project grace time failed"
- $LFS setquota -t -p --block-grace $MAX_DQ_TIME -o $qpool $DIR ||
- error "set project grace time failed"
+ $LFS setquota -t -p --block-grace $MAX_DQ_TIME --pool $qpool \
+ $DIR || error "set project grace time failed"
fi
# cleanup
$LFS setquota -t -u --block-grace $MAX_DQ_TIME --inode-grace \
$MAX_IQ_TIME $DIR || error "restore user grace time failed"
$LFS setquota -t -u --block-grace $MAX_DQ_TIME \
- -o $qpool $DIR || error "restore user grace time failed"
+ --pool $qpool $DIR || error "restore user grace time failed"
$LFS setquota -t -g --block-grace $MAX_DQ_TIME --inode-grace \
$MAX_IQ_TIME $DIR || error "restore group grace time failed"
$LFS setquota -t -g --block-grace $MAX_DQ_TIME \
- -o $qpool $DIR || error "restore group grace time failed"
+ --pool $qpool $DIR || error "restore group grace time failed"
}
run_test 3b "Quota pools: Block soft limit (start timer, expires, stop timer)"
$LFS setquota -t -u --block-grace $glbl_grace --inode-grace \
$MAX_IQ_TIME $DIR || error "set user grace time failed"
$LFS setquota -t -u --block-grace $grace1 \
- -o $qpool $DIR || error "set user grace time failed"
+ --pool $qpool $DIR || error "set user grace time failed"
$LFS setquota -t -u --block-grace $grace2 \
- -o $qpool2 $DIR || error "set user grace time failed"
+ --pool $qpool2 $DIR || error "set user grace time failed"
$LFS setquota -u $TSTUSR -b ${glbl_limit}M -B 0 -i 0 -I 0 $DIR ||
error "set user quota failed"
- $LFS setquota -u $TSTUSR -b ${limit}M -B 0 -o $qpool $DIR ||
+ $LFS setquota -u $TSTUSR -b ${limit}M -B 0 --pool $qpool $DIR ||
error "set user quota failed"
# qpool has minimum soft limit, but it's grace is grater than
# grace period of qpool2. Thus write shouldn't fail when
# hit qpool soft limit - only when reaches up qpool2 limit
# after grace2 seconds.
- $LFS setquota -u $TSTUSR -b ${limit2}M -B 0 -o $qpool2 $DIR ||
+ $LFS setquota -u $TSTUSR -b ${limit2}M -B 0 --pool $qpool2 $DIR ||
error "set user quota failed"
test_block_soft $testfile $grace2 $limit2 "u" $qpool2
$LFS setquota -t -u --block-grace $MAX_DQ_TIME --inode-grace \
$MAX_IQ_TIME $DIR || error "restore user grace time failed"
$LFS setquota -t -u --block-grace $MAX_DQ_TIME \
- -o $qpool $DIR || error "restore user grace time failed"
+ --pool $qpool $DIR || error "restore user grace time failed"
$LFS setquota -t -u --block-grace $MAX_DQ_TIME \
- -o $qpool2 $DIR || error "restore user grace time failed"
+ --pool $qpool2 $DIR || error "restore user grace time failed"
}
run_test 3c "Quota pools: check block soft limit on different pools"
local LIMIT=$2
local grace=$3
local qtype=$4
+ local SOFT_LIMIT=$(do_facet $SINGLEMDS $LCTL get_param -n \
+ qmt.$FSNAME-QMT0000.md-0x0.soft_least_qunit)
setup_quota_test
trap cleanup_quota_test EXIT
$SHOW_QUOTA_INFO_PROJID
echo "Create file after timer goes off"
- # There is a window that space is accounted in the quota usage but
- # hasn't been decreased from the pending write, if we acquire quota
- # in this window, we'll acquire more than we needed.
- $RUNAS touch ${TESTFILE}_after_1 ${TESTFILE}_after_2 || true
- sync_all_data || true
- $RUNAS touch ${TESTFILE}_after_3 &&
+ # exceed least soft limit is possible
+ $RUNAS createmany -m ${TESTFILE}_after_3 $((SOFT_LIMIT + 1)) &&
quota_error a $TSTUSR "create after timer expired," \
"but expect EDQUOT"
sync_all_data || true
}
run_test 40c "Remote child Dir inherit project quota properly"
+test_40d() {
+ [ "$MDSCOUNT" -lt "2" ] && skip_env "needs >= 2 MDTs"
+ is_project_quota_supported || skip "Project quota is not supported"
+
+ setup_quota_test || error "setup quota failed with $?"
+ local dir="$DIR/$tdir/dir"
+
+ mkdir -p $dir
+ $LFS setdirstripe -D -c 2 -i -1 $dir || error "setdirstripe failed"
+ change_project -sp $TSTPRJID $dir ||
+ error "change project on $dir failed"
+ for i in $(seq 5); do
+ mkdir -p $dir/d$i/d$i ||
+ error "mkdir $dir/d$i/d$i failed"
+ local projid=$($LFS project -d $dir/d$i/d$i |
+ awk '{print $1}')
+ [ "$projid" == "$TSTPRJID" ] ||
+ error "projid id expected $TSTPRJID not $projid"
+ touch $dir/d$i/d$i/file
+ #verify inherit works file for stripe dir.
+ local projid=$($LFS project -d $dir/d$i/d$i/file | awk '{print $1}')
+ [ "$projid" == "$TSTPRJID" ] ||
+ error "file under remote dir expected 1 not $projid"
+ done
+
+ # account should be 1 + (2 + 1) *10 + 1 * 5
+ USED=$(getquota -p $TSTPRJID global curinodes)
+ [ "$USED" == "36" ] ||
+ error "file count expected 36 got $USED"
+
+ rm -rf $dir
+ cleanup_quota_test
+}
+run_test 40d "Stripe Directory inherit project quota properly"
+
+test_41() {
+ is_project_quota_supported ||
+ skip "Project quota is not supported"
+ setup_quota_test || error "setup quota failed with $?"
+ trap cleanup_quota_test EXIT
+ local dir="$DIR/$tdir/dir"
+ local blimit=102400
+ local ilimit=4096
+ local projid=$((testnum * 1000))
+
+ quota_init
+
+ # enable mdt/ost quota
+ set_mdt_qtype ugp || error "enable mdt quota failed"
+ set_ost_qtype ugp || error "enable ost quota failed"
+
+ test_mkdir -p $dir && change_project -sp $projid $dir
+ $LFS setquota -p $projid -b 0 -B ${blimit}K -i 0 -I $ilimit $dir ||
+ error "set project quota failed"
+
+ sync; sync_all_data
+ sleep_maxage
+
+ # check if df output works as expected
+ echo "== global statfs: $MOUNT =="
+ df -kP $MOUNT; df -iP $MOUNT; $LFS quota -p $projid $dir
+ echo
+ echo "== project statfs (prjid=$projid): $dir =="
+ df -kP $dir; df -iP $dir
+ local bused=$(getquota -p $projid global curspace)
+ local iused=$(getquota -p $projid global curinodes)
+ # note trailing space to match double printf from awk
+ local expected="$blimit $bused $ilimit $iused "
+
+ wait_update $HOSTNAME \
+ "{ df -kP $dir; df -iP $dir; } |
+ awk '/$FSNAME/ { printf \\\"%d %d \\\", \\\$2,\\\$3 }'" \
+ "$expected" ||
+ error "failed to get correct statfs for project quota"
+
+ cleanup_quota_test
+}
+run_test 41 "df should return projid-specific values"
+
test_50() {
! is_project_quota_supported &&
skip "Project quota is not supported"
fi
log "Increase default quota"
+
+ # LU-4505: sleep 5 seconds to enable quota acquire
+ sleep 5
+
# increase default quota
$LFS setquota $qdtype $qs $((LIMIT*3)) $qh $((LIMIT*3)) $DIR ||
error "set default quota failed"
fi
log "Set to use default quota again"
+
+ # LU-4505: sleep 5 seconds to enable quota acquire
+ sleep 5
+
$LFS setquota $qtype $qid -d $DIR ||
error "set $qid to use default quota failed"
error "set user quota failed"
log "User quota (block hardlimit:$limit MB)"
- $LFS setquota -u $TSTUSR -B ${limit}M -o $qpool $DIR ||
+ $LFS setquota -u $TSTUSR -B ${limit}M --pool $qpool $DIR ||
error "set user quota failed"
$RUNAS dd if=/dev/zero of="$dom0/f1" bs=1K count=512 oflag=sync ||
pool_add $qpool || error "pool_add failed"
pool_add_targets $qpool 0 0 || error "pool_add_targets failed"
- $LFS setquota -u $TSTUSR -B ${limit}M -o $qpool $DIR
+ $LFS setquota -u $TSTUSR -B ${limit}M --pool $qpool $DIR
rc=$?
[ $rc -eq $err ] || error "setquota res $rc != $err"
pool_add_targets $qpool 0 1 ||
error "pool_add_targets failed"
- $LFS setquota -u $TSTUSR -B ${limit}M -o $qpool $DIR ||
+ $LFS setquota -u $TSTUSR -B ${limit}M --pool $qpool $DIR ||
error "set user quota failed"
pool_add $qpool2 || error "pool_add failed"
pool_add_targets $qpool2 1 1 ||
error "pool_add_targets failed"
- $LFS setquota -u $TSTUSR -B ${limit}M -o $qpool2 $DIR ||
+ $LFS setquota -u $TSTUSR -B ${limit}M --pool $qpool2 $DIR ||
error "set user quota failed"
# make sure the system is clean
pool_add_targets $qpool 0 1 ||
error "pool_add_targets failed"
- $LFS setquota -u $TSTUSR -B ${limit1}M -o $qpool $DIR ||
+ $LFS setquota -u $TSTUSR -B ${limit1}M --pool $qpool $DIR ||
error "set user quota failed"
pool_add $qpool2 || error "pool_add failed"
pool_add_targets $qpool2 1 1 ||
error "pool_add_targets failed"
- $LFS setquota -u $TSTUSR -B ${limit2}M -o $qpool2 $DIR ||
+ $LFS setquota -u $TSTUSR -B ${limit2}M --pool $qpool2 $DIR ||
error "set user quota failed"
# make sure the system is clean
pool_add $qpool || error "pool_add failed"
pool_add_targets $qpool 1 1 || error "pool_add_targets failed"
- $LFS setquota -u $TSTUSR -B ${limit}M -o $qpool $DIR ||
+ $LFS setquota -u $TSTUSR -B ${limit}M --pool $qpool $DIR ||
error "set user quota failed"
# make sure the system is clean
git://git.whamcloud.com / fs / lustre-release.git / blobdiff