From 43f6218993bac14d0b01e1da5c14840433bae12b Mon Sep 17 00:00:00 2001 From: David Zafman Date: Thu, 5 Dec 2019 15:13:31 -0800 Subject: [PATCH] test: Use activate_osd() when restarting OSDs Signed-off-by: David Zafman --- .../erasure-code/test-erasure-eio.sh | 8 +++---- qa/standalone/osd/ec-error-rollforward.sh | 8 +++---- qa/standalone/osd/osd-bluefs-volume-ops.sh | 24 +++++++++---------- qa/standalone/osd/osd-dup.sh | 2 +- qa/standalone/osd/osd-recovery-stats.sh | 4 ++-- qa/standalone/osd/osd-rep-recov-eio.sh | 4 ++-- qa/standalone/osd/repro_long_log.sh | 2 +- qa/standalone/scrub/osd-scrub-repair.sh | 8 +++---- 8 files changed, 30 insertions(+), 30 deletions(-) diff --git a/qa/standalone/erasure-code/test-erasure-eio.sh b/qa/standalone/erasure-code/test-erasure-eio.sh index 7a6bb36b69bf7..d46be6e6254d8 100755 --- a/qa/standalone/erasure-code/test-erasure-eio.sh +++ b/qa/standalone/erasure-code/test-erasure-eio.sh @@ -173,7 +173,7 @@ function rados_put_get_data() { ceph osd out ${last_osd} || return 1 ! get_osds $poolname $objname | grep '\<'${last_osd}'\>' || return 1 ceph osd in ${last_osd} || return 1 - run_osd $dir ${last_osd} || return 1 + activate_osd $dir ${last_osd} || return 1 wait_for_clean || return 1 # Won't check for eio on get here -- recovery above might have fixed it else @@ -374,7 +374,7 @@ function TEST_ec_object_attr_read_error() { inject_eio ec mdata $poolname $objname $dir 1 || return 1 # Restart OSD - run_osd $dir ${primary_osd} || return 1 + activate_osd $dir ${primary_osd} || return 1 # Cluster should recover this object wait_for_clean || return 1 @@ -542,7 +542,7 @@ function TEST_ec_backfill_unfound() { inject_eio ec data $poolname $testobj $dir 0 || return 1 inject_eio ec data $poolname $testobj $dir 1 || return 1 - run_osd $dir ${last_osd} || return 1 + activate_osd $dir ${last_osd} || return 1 ceph osd in ${last_osd} || return 1 sleep 15 @@ -622,7 +622,7 @@ function TEST_ec_recovery_unfound() { inject_eio ec data $poolname $testobj $dir 0 || return 1 inject_eio ec data $poolname $testobj $dir 1 || return 1 - run_osd $dir ${last_osd} || return 1 + activate_osd $dir ${last_osd} || return 1 ceph osd in ${last_osd} || return 1 sleep 15 diff --git a/qa/standalone/osd/ec-error-rollforward.sh b/qa/standalone/osd/ec-error-rollforward.sh index 05188ad509653..410d5134d536a 100755 --- a/qa/standalone/osd/ec-error-rollforward.sh +++ b/qa/standalone/osd/ec-error-rollforward.sh @@ -53,10 +53,10 @@ function TEST_ec_error_rollforward() { kill $pids wait - run_osd $dir 0 || return 1 - run_osd $dir 1 || return 1 - run_osd $dir 2 || return 1 - run_osd $dir 3 || return 1 + activate_osd $dir 0 || return 1 + activate_osd $dir 1 || return 1 + activate_osd $dir 2 || return 1 + activate_osd $dir 3 || return 1 wait_for_clean || return 1 } diff --git a/qa/standalone/osd/osd-bluefs-volume-ops.sh b/qa/standalone/osd/osd-bluefs-volume-ops.sh index 5258cfc6d5bdd..1c9c5cf2a9953 100755 --- a/qa/standalone/osd/osd-bluefs-volume-ops.sh +++ b/qa/standalone/osd/osd-bluefs-volume-ops.sh @@ -140,13 +140,13 @@ function TEST_bluestore() { ceph-bluestore-tool --path $dir/3 fsck || return 1 - run_osd $dir 0 || return 1 + activate_osd $dir 0 || return 1 osd_pid0=$(cat $dir/osd.0.pid) - run_osd $dir 1 || return 1 + activate_osd $dir 1 || return 1 osd_pid1=$(cat $dir/osd.1.pid) - run_osd $dir 2 || return 1 + activate_osd $dir 2 || return 1 osd_pid2=$(cat $dir/osd.2.pid) - run_osd $dir 3 || return 1 + activate_osd $dir 3 || return 1 osd_pid3=$(cat $dir/osd.3.pid) wait_for_clean || return 1 @@ -218,13 +218,13 @@ function TEST_bluestore() { ceph-bluestore-tool --path $dir/3 fsck || return 1 - run_osd $dir 0 || return 1 + activate_osd $dir 0 || return 1 osd_pid0=$(cat $dir/osd.0.pid) - run_osd $dir 1 || return 1 + activate_osd $dir 1 || return 1 osd_pid1=$(cat $dir/osd.1.pid) - run_osd $dir 2 || return 1 + activate_osd $dir 2 || return 1 osd_pid2=$(cat $dir/osd.2.pid) - run_osd $dir 3 || return 1 + activate_osd $dir 3 || return 1 osd_pid3=$(cat $dir/osd.3.pid) # write some objects @@ -324,13 +324,13 @@ function TEST_bluestore() { ceph-bluestore-tool --path $dir/3 fsck || return 1 - run_osd $dir 0 || return 1 + activate_osd $dir 0 || return 1 osd_pid0=$(cat $dir/osd.0.pid) - run_osd $dir 1 || return 1 + activate_osd $dir 1 || return 1 osd_pid1=$(cat $dir/osd.1.pid) - run_osd $dir 2 || return 1 + activate_osd $dir 2 || return 1 osd_pid2=$(cat $dir/osd.2.pid) - run_osd $dir 3 || return 1 + activate_osd $dir 3 || return 1 osd_pid3=$(cat $dir/osd.3.pid) # write some objects diff --git a/qa/standalone/osd/osd-dup.sh b/qa/standalone/osd/osd-dup.sh index 26f583b9990ec..fdb2649ca0555 100755 --- a/qa/standalone/osd/osd-dup.sh +++ b/qa/standalone/osd/osd-dup.sh @@ -61,7 +61,7 @@ function TEST_filestore_to_bluestore() { --op dup || return 1 CEPH_ARGS=$O - run_osd $dir 0 || return 1 + activate_osd $dir 0 || return 1 while ! ceph osd stat | grep '3 up' ; do sleep 1 ; done ceph osd metadata 0 | grep bluestore || return 1 diff --git a/qa/standalone/osd/osd-recovery-stats.sh b/qa/standalone/osd/osd-recovery-stats.sh index f1e93e16cc508..b6955bb4c60cd 100755 --- a/qa/standalone/osd/osd-recovery-stats.sh +++ b/qa/standalone/osd/osd-recovery-stats.sh @@ -472,7 +472,7 @@ function TEST_recovery_multi() { kill $(cat $dir/osd.${primary}.pid) ceph osd down osd.${primary} - run_osd $dir ${otherosd} + activate_osd $dir ${otherosd} sleep 3 for i in $(seq $(expr $half + 1) $objects) @@ -485,7 +485,7 @@ function TEST_recovery_multi() { ceph osd unset noout ceph osd out osd.$primary osd.$otherosd - run_osd $dir ${primary} + activate_osd $dir ${primary} sleep 3 ceph osd pool set test size 4 diff --git a/qa/standalone/osd/osd-rep-recov-eio.sh b/qa/standalone/osd/osd-rep-recov-eio.sh index 6e9eeac394501..8dce41a98bbfd 100755 --- a/qa/standalone/osd/osd-rep-recov-eio.sh +++ b/qa/standalone/osd/osd-rep-recov-eio.sh @@ -208,7 +208,7 @@ function TEST_rep_backfill_unfound() { inject_eio rep data $poolname $testobj $dir 0 || return 1 inject_eio rep data $poolname $testobj $dir 1 || return 1 - run_osd $dir ${last_osd} || return 1 + activate_osd $dir ${last_osd} || return 1 ceph osd in ${last_osd} || return 1 sleep 15 @@ -285,7 +285,7 @@ function TEST_rep_recovery_unfound() { inject_eio rep data $poolname $testobj $dir 0 || return 1 inject_eio rep data $poolname $testobj $dir 1 || return 1 - run_osd $dir ${last_osd} || return 1 + activate_osd $dir ${last_osd} || return 1 ceph osd in ${last_osd} || return 1 sleep 15 diff --git a/qa/standalone/osd/repro_long_log.sh b/qa/standalone/osd/repro_long_log.sh index 7284fedb203f8..97d572e553f49 100755 --- a/qa/standalone/osd/repro_long_log.sh +++ b/qa/standalone/osd/repro_long_log.sh @@ -105,7 +105,7 @@ function TEST_repro_long_log2() local PRIMARY=$(ceph pg $PGID query | jq '.info.stats.up_primary') kill_daemons $dir TERM osd.$PRIMARY || return 1 CEPH_ARGS="--osd-max-pg-log-entries=2 --no-mon-config" ceph-objectstore-tool --data-path $dir/$PRIMARY --pgid $PGID --op trim-pg-log || return 1 - run_osd $dir $PRIMARY || return 1 + activate_osd $dir $PRIMARY || return 1 wait_for_clean || return 1 test_log_size $PGID 2 || return 1 } diff --git a/qa/standalone/scrub/osd-scrub-repair.sh b/qa/standalone/scrub/osd-scrub-repair.sh index 3ee4d1f066ac5..10917dd6ae693 100755 --- a/qa/standalone/scrub/osd-scrub-repair.sh +++ b/qa/standalone/scrub/osd-scrub-repair.sh @@ -600,8 +600,8 @@ function TEST_repair_stats() { OSD=$(expr $i % 2) _objectstore_tool_nodown $dir $OSD obj$i remove || return 1 done - run_osd $dir $primary $ceph_osd_args || return 1 - run_osd $dir $other $ceph_osd_args || return 1 + activate_osd $dir $primary $ceph_osd_args || return 1 + activate_osd $dir $other $ceph_osd_args || return 1 wait_for_clean || return 1 repair $pgid @@ -673,8 +673,8 @@ function TEST_repair_stats_ec() { OSD=$(expr $i % 2) _objectstore_tool_nodown $dir $OSD obj$i remove || return 1 done - run_osd $dir $primary $ceph_osd_args || return 1 - run_osd $dir $other $ceph_osd_args || return 1 + activate_osd $dir $primary $ceph_osd_args || return 1 + activate_osd $dir $other $ceph_osd_args || return 1 wait_for_clean || return 1 repair $pgid -- 2.39.5