RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 18:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #26416 from dzafman/wip-fix-test-loops

Browse Source 
test: Limit loops waiting for force-backfill/force-recovery to happen

Reviewed-by: Neha Ojha <nojha@redhat.com>
This commit is contained in:
David Zafman 2019-02-15 14:25:59 -08:00 committed by GitHub
commit afe8859e3e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
qa/standalone/osd/osd-backfill-prio.sh
View File

@ -48,6 +48,7 @@ function TEST_backfill_priority() {
local OSDS=5
# size 2 -> 1 means degraded by 1, so add 1 to base prio
local degraded_prio=$(expr $DEGRADED_PRIO + 1)
local max_tries=10
run_mon $dir a || return 1
run_mgr $dir x || return 1
@ -159,8 +160,15 @@ function TEST_backfill_priority() {
CEPH_ARGS='' ceph --admin-daemon $(get_asok_path osd.${chk_osd1_1}) dump_reservations || return 1
# 3. Item is in progress, adjust priority with no higher priority waiting
while(ceph pg force-backfill $PG3 2>&1 | grep -q "doesn't require backfilling")
for i in $(seq 1 $max_tries)
do
if ! ceph pg force-backfill $PG3 2>&1 | grep -q "doesn't require backfilling"; then
break
fi
if [ "$i" = "$max_tries" ]; then
echo "ERROR: Didn't appear to be able to force-backfill"
ERRORS=$(expr $ERRORS + 1)
fi
sleep 2
done
flush_pg_stats || return 1
@ -202,8 +210,15 @@ function TEST_backfill_priority() {
fi
# 1. Item is queued, re-queue with new priority
while(ceph pg force-backfill $PG2 2>&1 | grep -q "doesn't require backfilling")
for i in $(seq 1 $max_tries)
do
if ! ceph pg force-backfill $PG2 2>&1 | grep -q "doesn't require backfilling"; then
break
fi
if [ "$i" = "$max_tries" ]; then
echo "ERROR: Didn't appear to be able to force-backfill"
ERRORS=$(expr $ERRORS + 1)
fi
sleep 2
done
sleep 2

19
qa/standalone/osd/osd-recovery-prio.sh
View File

@ -44,6 +44,7 @@ function TEST_recovery_priority() {
local dir=$1
local pools=10
local OSDS=5
local max_tries=10
run_mon $dir a || return 1
run_mgr $dir x || return 1
@ -154,8 +155,15 @@ function TEST_recovery_priority() {
CEPH_ARGS='' ceph --admin-daemon $(get_asok_path osd.${chk_osd1_1}) dump_reservations || return 1
# 3. Item is in progress, adjust priority with no higher priority waiting
while(ceph pg force-recovery $PG3 2>&1 | grep -q "doesn't require recovery")
for i in $(seq 1 $max_tries)
do
if ! ceph pg force-recovery $PG3 2>&1 | grep -q "doesn't require recovery"; then
break
fi
if [ "$i" = "$max_tries" ]; then
echo "ERROR: Didn't appear to be able to force-recovery"
ERRORS=$(expr $ERRORS + 1)
fi
sleep 2
done
flush_pg_stats || return 1
@ -197,8 +205,15 @@ function TEST_recovery_priority() {
fi
# 1. Item is queued, re-queue with new priority
while(ceph pg force-recovery $PG2 2>&1 | grep -q "doesn't require recovery")
for i in $(seq 1 $max_tries)
do
if ! ceph pg force-recovery $PG2 2>&1 | grep -q "doesn't require recovery"; then
break
fi
if [ "$i" = "$max_tries" ]; then
echo "ERROR: Didn't appear to be able to force-recovery"
ERRORS=$(expr $ERRORS + 1)
fi
sleep 2
done
sleep 2