From: xinxin shu <xinxin.shu@intel.com>
Date: Mon, 6 Jul 2015 21:06:27 +0000 (+0800)
Subject: qa: update pool quota test for internal retries
X-Git-Tag: v9.1.0~261^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F5024%2Fhead;p=ceph.git

qa: update pool quota test for internal retries

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
---

diff --git a/qa/workunits/rados/test_pool_quota.sh b/qa/workunits/rados/test_pool_quota.sh
index 146b677a05f..71a9e52fe0c 100755
--- a/qa/workunits/rados/test_pool_quota.sh
+++ b/qa/workunits/rados/test_pool_quota.sh
@@ -12,27 +12,55 @@ done
 
 sleep 30
 
-rados -p $p put onemore /etc/passwd  && exit 1 || true
+rados -p $p put onemore /etc/passwd  &
+pid=$!
 
 ceph osd pool set-quota $p max_objects 100
-sleep 30
+wait $pid 
+[ $? -ne 0 ] && exit 1 || true
 
-rados -p $p put onemore /etc/passwd
+rados -p $p put twomore /etc/passwd
 
 # bytes
 ceph osd pool set-quota $p max_bytes 100
 sleep 30
 
-rados -p $p put two /etc/passwd && exit 1 || true
+rados -p $p put two /etc/passwd &
+pid=$!
 
 ceph osd pool set-quota $p max_bytes 0
 ceph osd pool set-quota $p max_objects 0
-sleep 30
+wait $pid 
+[ $? -ne 0 ] && exit 1 || true
 
 rados -p $p put three /etc/passwd
 
+
+#one pool being full does not block a different pool
+
+pp=`uuidgen`
+
+ceph osd pool create $pp 12
+
+# set objects quota 
+ceph osd pool set-quota $pp max_objects 10
+sleep 30
+
+for f in `seq 1 10` ; do
+ rados -p $pp put obj$f /etc/passwd
+done
+
+sleep 30
+
+rados -p $p put threemore /etc/passwd 
+
+ceph osd pool set-quota $p max_bytes 0
+ceph osd pool set-quota $p max_objects 0
+
+sleep 30
 # done
 ceph osd pool delete $p $p --yes-i-really-really-mean-it
+ceph osd pool delete $pp $pp --yes-i-really-really-mean-it
 
 echo OK