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

Merge pull request #11449 from dzafman/wip-scrub-prep

Browse Source 
test/osd-scrub-repair.sh: Use test case specific object names to help…

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
David Zafman 2016-10-12 09:35:40 -07:00 committed by GitHub
commit 3439cb0a48
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/test/osd/osd-scrub-repair.sh
View File

@ -313,31 +313,31 @@ function TEST_list_missing_erasure_coded() {
wait_for_clean || return 1
# Put an object and remove the two shards (including primary)
add_something $dir $poolname OBJ0 || return 1
local -a osds=($(get_osds $poolname OBJ0))
add_something $dir $poolname MOBJ0 || return 1
local -a osds=($(get_osds $poolname MOBJ0))
pids=""
run_in_background pids objectstore_tool $dir ${osds[0]} OBJ0 remove
run_in_background pids objectstore_tool $dir ${osds[1]} OBJ0 remove
run_in_background pids objectstore_tool $dir ${osds[0]} MOBJ0 remove
run_in_background pids objectstore_tool $dir ${osds[1]} MOBJ0 remove
wait_background pids
return_code=$?
if [ $return_code -ne 0 ]; then return $return_code; fi
# Put another object and remove two shards (excluding primary)
add_something $dir $poolname OBJ1 || return 1
local -a osds=($(get_osds $poolname OBJ1))
add_something $dir $poolname MOBJ1 || return 1
local -a osds=($(get_osds $poolname MOBJ1))
pids=""
run_in_background pids objectstore_tool $dir ${osds[1]} OBJ1 remove
run_in_background pids objectstore_tool $dir ${osds[2]} OBJ1 remove
run_in_background pids objectstore_tool $dir ${osds[1]} MOBJ1 remove
run_in_background pids objectstore_tool $dir ${osds[2]} MOBJ1 remove
wait_background pids
return_code=$?
if [ $return_code -ne 0 ]; then return $return_code; fi
# Get get - both objects should in the same PG
local pg=$(get_pg $poolname OBJ0)
local pg=$(get_pg $poolname MOBJ0)
# Repair the PG, which triggers the recovering,
# and should mark the object as unfound
@ -345,7 +345,7 @@ function TEST_list_missing_erasure_coded() {
for i in $(seq 0 120) ; do
[ $i -lt 60 ] || return 1
matches=$(ceph pg $pg list_missing | egrep "OBJ0|OBJ1" | wc -l)
matches=$(ceph pg $pg list_missing | egrep "MOBJ0|MOBJ1" | wc -l)
[ $matches -eq 2 ] && break
done
@ -370,7 +370,7 @@ function TEST_corrupt_scrub_replicated() {
wait_for_clean || return 1
for i in $(seq 0 $total_objs) ; do
objname=OBJ${i}
objname=ROBJ${i}
add_something $dir $poolname $objname
if [ $i = "0" ];
then
@ -382,7 +382,7 @@ function TEST_corrupt_scrub_replicated() {
fi
done
local pg=$(get_pg $poolname OBJ0)
local pg=$(get_pg $poolname ROBJ0)
pg_scrub $pg
rados list-inconsistent-pg $poolname > $dir/json || return 1