From: Jason Dillaman <dillaman@redhat.com>
Date: Mon, 19 Feb 2018 19:47:46 +0000 (-0500)
Subject: qa/workunits/rbd: remove sanity check in journal.sh test
X-Git-Tag: v13.0.2~224^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F20490%2Fhead;p=ceph.git

qa/workunits/rbd: remove sanity check in journal.sh test

When the OSDs are being concurrently thrashed, this can result in
sporadic failures due to the admin socket disappearing.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/qa/workunits/rbd/journal.sh b/qa/workunits/rbd/journal.sh
index 157e7ad8af57..d35ea189a840 100755
--- a/qa/workunits/rbd/journal.sh
+++ b/qa/workunits/rbd/journal.sh
@@ -13,7 +13,7 @@ function list_tests()
 
 function usage()
 {
-  echo "usage: $0 [-h|-l|-t <testname> [-t <testname>...] [--no-sanity-check] [--no-cleanup]]"
+  echo "usage: $0 [-h|-l|-t <testname> [-t <testname>...] [--no-cleanup]]"
 }
 
 function expect_false()
@@ -273,7 +273,6 @@ TESTS+=" rbd_feature"
 
 tests_to_run=()
 
-sanity_check=true
 cleanup=true
 
 while [[ $# -gt 0 ]]; do
@@ -283,9 +282,6 @@ while [[ $# -gt 0 ]]; do
 	"-l" )
 	    do_list=1
 	    ;;
-	"--no-sanity-check" )
-	    sanity_check=false
-	    ;;
 	"--no-cleanup" )
 	    cleanup=false
 	    ;;
@@ -322,15 +318,9 @@ if test -z "$tests_to_run" ; then
 fi
 
 for i in $tests_to_run; do
-    if $sanity_check ; then
-	wait_for_clean
-    fi
     set -x
     test_${i}
     set +x
 done
-if $sanity_check ; then
-    wait_for_clean
-fi
 
 echo OK