From: Loic Dachary <loic-201408@dachary.org>
Date: Tue, 28 Oct 2014 21:09:58 +0000 (+0100)
Subject: qa: avoid qa/workunits/cephtool/test.sh unstability
X-Git-Tag: v0.88~11^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6fca23f6104bcf3156d41dfa745ecf111861a1b6;p=ceph.git

qa: avoid qa/workunits/cephtool/test.sh unstability

For testing injectargs a configuration option was changed that has side
effects on the cluster. It could introduce random failures later. It is
replaced with a configuration option that cannot have adverse side
effects on the cluster.

http://tracker.ceph.com/issues/9919 Fixes: #9919

Signed-off-by: Loic Dachary <loic-201408@dachary.org>
---

diff --git a/qa/workunits/cephtool/test.sh b/qa/workunits/cephtool/test.sh
index 3236eb3beda..88ed3b19d2d 100755
--- a/qa/workunits/cephtool/test.sh
+++ b/qa/workunits/cephtool/test.sh
@@ -113,7 +113,7 @@ function check_response()
 		exit 1
 	fi
 
-	if ! grep "$expected_string" $TMPFILE >/dev/null 2>&1 ; then 
+	if ! grep --quiet -- "$expected_string" $TMPFILE ; then 
 		echo "Didn't find $expected_string in output" >&2
 		cat $TMPFILE >&2
 		exit 1
@@ -160,14 +160,14 @@ function test_mon_injectargs()
   CEPH_ARGS='--mon_debug_dump_location the.dump' ./ceph tell osd.0 injectargs --no-osd_debug_op_order >& $TMPFILE || return 1
   check_response "osd_debug_op_order = 'false'"
   ! grep "the.dump" $TMPFILE || return 1
-  ceph tell osd.0 injectargs '--osd_debug_op_order --osd_debug_drop_ping_probability 444' >& $TMPFILE || return 1
-  check_response "osd_debug_drop_ping_probability = '444' osd_debug_op_order = 'true'"
+  ceph tell osd.0 injectargs '--osd_debug_op_order --osd_failsafe_full_ratio .99' >& $TMPFILE || return 1
+  check_response "osd_debug_op_order = 'true' osd_failsafe_full_ratio = '0.99'"
   ceph tell osd.0 injectargs --no-osd_debug_op_order >& $TMPFILE || return 1
   check_response "osd_debug_op_order = 'false'"
   ceph tell osd.0 injectargs -- --osd_debug_op_order >& $TMPFILE || return 1
   check_response "osd_debug_op_order = 'true'"
-  ceph tell osd.0 injectargs -- '--osd_debug_op_order --osd_debug_drop_ping_probability 555' >& $TMPFILE || return 1
-  check_response "osd_debug_drop_ping_probability = '555' osd_debug_op_order = 'true'" 
+  ceph tell osd.0 injectargs -- '--osd_debug_op_order --osd_failsafe_full_ratio .98' >& $TMPFILE || return 1
+  check_response "osd_debug_op_order = 'true' osd_failsafe_full_ratio = '0.98'" 
 }
 
 function test_mon_injectargs_SI()