diff options
Diffstat (limited to 'qa/standalone/ceph-helpers.sh')
| -rwxr-xr-x | qa/standalone/ceph-helpers.sh | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/qa/standalone/ceph-helpers.sh b/qa/standalone/ceph-helpers.sh index 0901815ee9b..41e92edce44 100755 --- a/qa/standalone/ceph-helpers.sh +++ b/qa/standalone/ceph-helpers.sh @@ -754,24 +754,14 @@ function test_run_osd() { echo "$backfills" | grep --quiet 'osd_max_backfills' || return 1 run_osd $dir 1 --osd-max-backfills 20 || return 1 - local scheduler=$(get_op_scheduler 1) local backfills=$(CEPH_ARGS='' ceph --format=json daemon $(get_asok_path osd.1) \ config get osd_max_backfills) - if [ "$scheduler" = "mclock_scheduler" ]; then - test "$backfills" = '{"osd_max_backfills":"1000"}' || return 1 - else - test "$backfills" = '{"osd_max_backfills":"20"}' || return 1 - fi + test "$backfills" = '{"osd_max_backfills":"20"}' || return 1 CEPH_ARGS="$CEPH_ARGS --osd-max-backfills 30" run_osd $dir 2 || return 1 - local scheduler=$(get_op_scheduler 2) local backfills=$(CEPH_ARGS='' ceph --format=json daemon $(get_asok_path osd.2) \ config get osd_max_backfills) - if [ "$scheduler" = "mclock_scheduler" ]; then - test "$backfills" = '{"osd_max_backfills":"1000"}' || return 1 - else - test "$backfills" = '{"osd_max_backfills":"30"}' || return 1 - fi + test "$backfills" = '{"osd_max_backfills":"30"}' || return 1 teardown $dir || return 1 } @@ -906,14 +896,9 @@ function test_activate_osd() { kill_daemons $dir TERM osd || return 1 activate_osd $dir 0 --osd-max-backfills 20 || return 1 - local scheduler=$(get_op_scheduler 0) local backfills=$(CEPH_ARGS='' ceph --format=json daemon $(get_asok_path osd.0) \ config get osd_max_backfills) - if [ "$scheduler" = "mclock_scheduler" ]; then - test "$backfills" = '{"osd_max_backfills":"1000"}' || return 1 - else - test "$backfills" = '{"osd_max_backfills":"20"}' || return 1 - fi + test "$backfills" = '{"osd_max_backfills":"20"}' || return 1 teardown $dir || return 1 } @@ -936,14 +921,9 @@ function test_activate_osd_after_mark_down() { wait_for_osd down 0 || return 1 activate_osd $dir 0 --osd-max-backfills 20 || return 1 - local scheduler=$(get_op_scheduler 0) local backfills=$(CEPH_ARGS='' ceph --format=json daemon $(get_asok_path osd.0) \ config get osd_max_backfills) - if [ "$scheduler" = "mclock_scheduler" ]; then - test "$backfills" = '{"osd_max_backfills":"1000"}' || return 1 - else - test "$backfills" = '{"osd_max_backfills":"20"}' || return 1 - fi + test "$backfills" = '{"osd_max_backfills":"20"}' || return 1 teardown $dir || return 1 } |