From 5aa445897c293cae407454fadbbc47116a2cbe76 Mon Sep 17 00:00:00 2001 From: xie xingguo Date: Sat, 16 Sep 2017 10:04:56 +0800 Subject: [PATCH] qa: fix pool-quota related tests https://github.com/ceph/ceph/pull/17371 introduces support of per-pool space-full flag, which turns out to set both full and full_no_quota flags now if a pool is currently running out of quota. Actually this test is fragile as long as we keep appending new flags at pool granularity, but let's not bother with that complexity now. Fixes: http://tracker.ceph.com/issues/21409 Signed-off-by: xie xingguo (cherry picked from commit 5dd3458eec7d6c56a71ee6f0fcdd45aa15a58ec7) --- qa/workunits/rados/test_rados_tool.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa/workunits/rados/test_rados_tool.sh b/qa/workunits/rados/test_rados_tool.sh index 6a3ebe0b22e2d..87c86ee694308 100755 --- a/qa/workunits/rados/test_rados_tool.sh +++ b/qa/workunits/rados/test_rados_tool.sh @@ -346,7 +346,7 @@ test_rmobj() { $CEPH_TOOL osd pool set-quota $p max_objects 1 V1=`mktemp fooattrXXXXXXX` $RADOS_TOOL put $OBJ $V1 -p $p - while ! $CEPH_TOOL osd dump | grep 'full max_objects' + while ! $CEPH_TOOL osd dump | grep 'full_no_quota max_objects' do sleep 2 done -- 2.39.5