Merge pull request #9480 from ErwanAliasr1/evelu-cephtool

cephtool/test.sh: Adding iterations numbers in output log

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2016-06-03 23:09:49 +08:00
commit c6c6968e86

View File

@ -14,9 +14,10 @@ function check_no_osd_down()
function wait_no_osd_down()
{
for i in $(seq 1 300) ; do
max_run=300
for i in $(seq 1 $max_run) ; do
if ! check_no_osd_down ; then
echo "waiting for osd(s) to come back up"
echo "waiting for osd(s) to come back up ($i/$max_run)"
sleep 1
else
break
@ -666,9 +667,10 @@ function check_mds_active()
function wait_mds_active()
{
fs_name=$1
for i in $(seq 1 300) ; do
max_run=300
for i in $(seq 1 $max_run) ; do
if ! check_mds_active $fs_name ; then
echo "waiting for an active MDS daemon"
echo "waiting for an active MDS daemon ($i/$max_run)"
sleep 5
else
break
@ -1097,9 +1099,10 @@ function test_mon_osd()
ceph osd down 0
ceph osd dump | grep 'osd.0 down'
ceph osd unset noup
for ((i=0; i < 1000; i++)); do
max_run=1000
for ((i=0; i < $max_run; i++)); do
if ! ceph osd dump | grep 'osd.0 up'; then
echo "waiting for osd.0 to come back up"
echo "waiting for osd.0 to come back up ($i/$max_run)"
sleep 1
else
break