RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-29 15:03:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: osd-scrub-snaps.sh: After snapshot removal wait for snaptrim to complete

Browse Source 
Due to deliberate corruptions snaptrim_error means snaptrim is done

Signed-off-by: David Zafman <dzafman@redhat.com>
This commit is contained in:
David Zafman 2018-06-07 18:03:28 -07:00
parent e37f95ac27
commit a159f162c5
1 changed files with 36 additions and 4 deletions

40
qa/standalone/scrub/osd-scrub-snaps.sh
View File

@ -688,12 +688,28 @@ EOF
pids+="$(cat $pidfile) "
done
ERRORS=0
for i in `seq 1 7`
do
rados -p $poolname rmsnap snap$i
done
ERRORS=0
sleep 5
local -i loop=0
while ceph pg dump pgs | grep -q snaptrim;
do
if ceph pg dump pgs | grep -q snaptrim_error;
then
break
fi
sleep 2
loop+=1
if (( $loop >= 10 )) ; then
ERRORS=$(expr $ERRORS + 1)
break
fi
done
ceph pg dump pgs
for pid in $pids
do
@ -1136,6 +1152,8 @@ fi
pids+="$(cat $pidfile) "
done
ERRORS=0
# When removing snapshots with a corrupt replica, it crashes.
# See http://tracker.ceph.com/issues/23875
if [ $which = "primary" ];
@ -1144,9 +1162,23 @@ fi
do
rados -p $poolname rmsnap snap$i
done
sleep 5
local -i loop=0
while ceph pg dump pgs | grep -q snaptrim;
do
if ceph pg dump pgs | grep -q snaptrim_error;
then
break
fi
sleep 2
loop+=1
if (( $loop >= 10 )) ; then
ERRORS=$(expr $ERRORS + 1)
break
fi
done
fi
ERRORS=0
ceph pg dump pgs
for pid in $pids
do