From 16ead95daa3d1309e8e76e57416b4201e71d0449 Mon Sep 17 00:00:00 2001
From: xinxin shu <xinxin.shu@intel.com>
Date: Tue, 7 Jul 2015 05:06:27 +0800
Subject: [PATCH] qa: update pool quota test for internal retries

Signed-off-by: xinxin shu <xinxin.shu@intel.com>
---
 qa/workunits/rados/test_pool_quota.sh | 38 +++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/qa/workunits/rados/test_pool_quota.sh b/qa/workunits/rados/test_pool_quota.sh
index 146b677a05fcd..71a9e52fe0cfc 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
 
-- 
2.39.5