From: David Zafman Date: Fri, 8 Jun 2018 18:56:18 +0000 (-0700) Subject: test: Fix some function desciptions X-Git-Tag: v14.0.1~1091^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f886ebba083a37c1b2d1fcf1a592008b4b16a8aa;p=ceph.git test: Fix some function desciptions Signed-off-by: David Zafman --- diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh index 47d2468a14ff..3962095d65e0 100755 --- a/qa/standalone/ceph-helpers.sh +++ b/qa/standalone/ceph-helpers.sh @@ -140,6 +140,7 @@ function test_setup() { # subvolumes that relate to it. # # @param dir path name of the environment +# @param dumplogs pass "1" to dump logs otherwise it will only if cores found # @return 0 on success, 1 on error # function teardown() { @@ -1442,9 +1443,11 @@ function test_wait_for_clean() { ####################################################################### ## -# Wait until the cluster becomes HEALTH_OK again for $TIMEOUT seconds. +# Wait until the cluster has health condition passed as arg +# again for $TIMEOUT seconds. # -# @return 0 if the cluster is HEALTHY, 1 otherwise +# @param string to grep for in health detail +# @return 0 if the cluster health matches request, 1 otherwise # function wait_for_health() { local grepstr=$1 @@ -1461,6 +1464,12 @@ function wait_for_health() { done } +## +# Wait until the cluster becomes HEALTH_OK again or if it does not make progress +# for $TIMEOUT seconds. +# +# @return 0 if the cluster is HEALTHY, 1 otherwise +# function wait_for_health_ok() { wait_for_health "HEALTH_OK" || return 1 }