mirror of
https://github.com/ceph/ceph
synced 2025-01-01 00:22:25 +00:00
26cb966cab
- In the jewel era, we fast-forwarded the PG to the OSD's latest epoch and cleared past_intervals. - In mimic, as of 2347ecb9614b0cd4cd9eae1d67b03119cc7ad18e, we brought the PG up to date while updating past_intervals. (At the same time we removed the OSD's parallel past_intervals regeneration.) The problem is that the tool then has to reimplement the past_intervals update logic, and *also* has to cope with splits and merges. Splits are somewhat easier (until now we enable partial import of a PG into a split child), but merges are not so easy. This patch changes it so we import the PG and leave the pg_epoch matching the import file. The OSD is then responsible for bringing it up to date with the latest map, and dealing with any intervening splits or merges. We also adjust the safety check to ensure that we don't collide with any existing PG, either a child we eventually split into, or a parent we eventually merge into. Fixes: http://tracker.ceph.com/issues/35955 Signed-off-by: Sage Weil <sage@redhat.com>
119 lines
3.8 KiB
Bash
Executable File
119 lines
3.8 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
source $CEPH_ROOT/qa/standalone/ceph-helpers.sh
|
|
|
|
function run() {
|
|
local dir=$1
|
|
shift
|
|
|
|
export CEPH_MON="127.0.0.1:7147" # git grep '\<7147\>' : there must be only one
|
|
export CEPH_ARGS
|
|
CEPH_ARGS+="--fsid=$(uuidgen) --auth-supported=none "
|
|
CEPH_ARGS+="--mon-host=$CEPH_MON --mon_min_osdmap_epochs=50 --paxos_service_trim_min=10"
|
|
|
|
local funcs=${@:-$(set | sed -n -e 's/^\(TEST_[0-9a-z_]*\) .*/\1/p')}
|
|
for func in $funcs ; do
|
|
$func $dir || return 1
|
|
done
|
|
}
|
|
|
|
function TEST_import_after_merge_and_gap() {
|
|
local dir=$1
|
|
|
|
setup $dir || return 1
|
|
run_mon $dir a --osd_pool_default_size=1 || return 1
|
|
run_mgr $dir x || return 1
|
|
run_osd $dir 0 || return 1
|
|
|
|
ceph osd pool create foo 2 || return 1
|
|
wait_for_clean || return 1
|
|
rados -p foo bench 3 write -b 1024 --no-cleanup || return 1
|
|
|
|
kill_daemons $dir TERM osd.0
|
|
ceph-objectstore-tool --data-path $dir/0 --op export --pgid 1.1 --file $dir/1.1 --force || return 1
|
|
ceph-objectstore-tool --data-path $dir/0 --op export --pgid 1.0 --file $dir/1.0 --force || return 1
|
|
activate_osd $dir 0 || return 1
|
|
|
|
ceph osd pool set foo pg_num 1
|
|
sleep 5
|
|
while ceph daemon osd.0 perf dump | jq '.osd.numpg' | grep 2 ; do sleep 1 ; done
|
|
wait_for_clean || return 1
|
|
|
|
#
|
|
kill_daemons $dir TERM osd.0
|
|
ceph-objectstore-tool --data-path $dir/0 --op remove --pgid 1.0 --force || return 1
|
|
# this will import both halves the original pg
|
|
ceph-objectstore-tool --data-path $dir/0 --op import --pgid 1.1 --file $dir/1.1 || return 1
|
|
ceph-objectstore-tool --data-path $dir/0 --op import --pgid 1.0 --file $dir/1.0 || return 1
|
|
activate_osd $dir 0 || return 1
|
|
|
|
wait_for_clean || return 1
|
|
|
|
# make a map gap
|
|
for f in `seq 1 50` ; do
|
|
ceph osd set nodown
|
|
ceph osd unset nodown
|
|
done
|
|
wait_for_clean || return 1
|
|
ceph osd down 0
|
|
sleep 3
|
|
wait_for_clean || return 1
|
|
|
|
kill_daemons $dir TERM osd.0
|
|
|
|
# this should fail.. 1.1 still doesn't exist
|
|
! ceph-objectstore-tool --data-path $dir/0 --op import --pgid 1.1 --file $dir/1.1 || return 1
|
|
|
|
# this should not
|
|
ceph-objectstore-tool --data-path $dir/0 --op remove --pgid 1.0 --force || return 1
|
|
ceph-objectstore-tool --data-path $dir/0 --op import --pgid 1.1 --file $dir/1.1 || return 1
|
|
ceph-objectstore-tool --data-path $dir/0 --op import --pgid 1.0 --file $dir/1.0 || return 1
|
|
|
|
activate_osd $dir 0 || return 1
|
|
|
|
wait_for_clean || return 1
|
|
}
|
|
|
|
function TEST_import_after_split() {
|
|
local dir=$1
|
|
|
|
setup $dir || return 1
|
|
run_mon $dir a --osd_pool_default_size=1 || return 1
|
|
run_mgr $dir x || return 1
|
|
run_osd $dir 0 || return 1
|
|
|
|
ceph osd pool create foo 1 || return 1
|
|
wait_for_clean || return 1
|
|
rados -p foo bench 3 write -b 1024 --no-cleanup || return 1
|
|
|
|
kill_daemons $dir TERM osd.0
|
|
ceph-objectstore-tool --data-path $dir/0 --op export --pgid 1.0 --file $dir/1.0 --force || return 1
|
|
activate_osd $dir 0 || return 1
|
|
|
|
ceph osd pool set foo pg_num 2
|
|
sleep 5
|
|
while ceph daemon osd.0 perf dump | jq '.osd.numpg' | grep 1 ; do sleep 1 ; done
|
|
wait_for_clean || return 1
|
|
|
|
kill_daemons $dir TERM osd.0
|
|
|
|
ceph-objectstore-tool --data-path $dir/0 --op remove --pgid 1.0 --force || return 1
|
|
|
|
# this should fail because 1.1 (split child) is there
|
|
! ceph-objectstore-tool --data-path $dir/0 --op import --pgid 1.0 --file $dir/1.0 || return 1
|
|
|
|
ceph-objectstore-tool --data-path $dir/0 --op remove --pgid 1.1 --force || return 1
|
|
# now it will work (1.1. is gone)
|
|
ceph-objectstore-tool --data-path $dir/0 --op import --pgid 1.0 --file $dir/1.0 || return 1
|
|
|
|
activate_osd $dir 0 || return 1
|
|
|
|
wait_for_clean || return 1
|
|
}
|
|
|
|
|
|
main pg-split-merge "$@"
|
|
|
|
# Local Variables:
|
|
# compile-command: "cd ../.. ; make -j4 && test/osd/pg-split-merge.sh"
|
|
# End:
|