From e7097593a757d69221c3a7613c0145870aebfbd8 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 6 Jan 2018 19:38:57 +0800 Subject: [PATCH] qa/standalone: remove osd-map-max-advance related tests this setting was removed in 8967b73 Fixes: http://tracker.ceph.com/issues/22596 Signed-off-by: Kefu Chai --- qa/standalone/osd/osd-config.sh | 37 ------------------- .../point-to-point-upgrade.yaml | 1 - 2 files changed, 38 deletions(-) diff --git a/qa/standalone/osd/osd-config.sh b/qa/standalone/osd/osd-config.sh index a613a403f12..c850ecd35b9 100755 --- a/qa/standalone/osd/osd-config.sh +++ b/qa/standalone/osd/osd-config.sh @@ -40,16 +40,13 @@ function TEST_config_init() { run_mon $dir a || return 1 run_mgr $dir x || return 1 - local advance=1000 local stale=1000 local cache=500 run_osd $dir 0 \ - --osd-map-max-advance=$advance \ --osd-map-cache-size=$cache \ --osd-pg-epoch-persisted-max-stale=$stale \ || return 1 CEPH_ARGS='' ceph --admin-daemon $(get_asok_path osd.0) log flush || return 1 - grep 'is not > osd_map_max_advance' $dir/osd.0.log || return 1 grep 'is not > osd_pg_epoch_persisted_max_stale' $dir/osd.0.log || return 1 } @@ -62,42 +59,8 @@ function TEST_config_track() { local osd_map_cache_size=$(CEPH_ARGS='' ceph-conf \ --show-config-value osd_map_cache_size) - local osd_map_max_advance=$(CEPH_ARGS='' ceph-conf \ - --show-config-value osd_map_max_advance) local osd_pg_epoch_persisted_max_stale=$(CEPH_ARGS='' ceph-conf \ --show-config-value osd_pg_epoch_persisted_max_stale) - # - # lower cache_size under max_advance to trigger the warning - # - ! grep 'is not > osd_map_max_advance' $dir/osd.0.log || return 1 - local cache=$(($osd_map_max_advance / 2)) - ceph tell osd.0 injectargs "--osd-map-cache-size $cache" || return 1 - CEPH_ARGS='' ceph --admin-daemon $(get_asok_path osd.0) log flush || return 1 - grep 'is not > osd_map_max_advance' $dir/osd.0.log || return 1 - rm $dir/osd.0.log - CEPH_ARGS='' ceph --admin-daemon $(get_asok_path osd.0) log reopen || return 1 - - # - # reset cache_size to the default and assert that it does not trigger the warning - # - ! grep 'is not > osd_map_max_advance' $dir/osd.0.log || return 1 - local cache=$osd_map_cache_size - ceph tell osd.0 injectargs "--osd-map-cache-size $cache" || return 1 - CEPH_ARGS='' ceph --admin-daemon $(get_asok_path osd.0) log flush || return 1 - ! grep 'is not > osd_map_max_advance' $dir/osd.0.log || return 1 - rm $dir/osd.0.log - CEPH_ARGS='' ceph --admin-daemon $(get_asok_path osd.0) log reopen || return 1 - - # - # increase the osd_map_max_advance above the default cache_size - # - ! grep 'is not > osd_map_max_advance' $dir/osd.0.log || return 1 - local advance=$(($osd_map_cache_size * 2)) - ceph tell osd.0 injectargs "--osd-map-max-advance $advance" || return 1 - CEPH_ARGS='' ceph --admin-daemon $(get_asok_path osd.0) log flush || return 1 - grep 'is not > osd_map_max_advance' $dir/osd.0.log || return 1 - rm $dir/osd.0.log - CEPH_ARGS='' ceph --admin-daemon $(get_asok_path osd.0) log reopen || return 1 # # increase the osd_pg_epoch_persisted_max_stale above the default cache_size diff --git a/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml b/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml index 330da83450a..d06c0219aec 100644 --- a/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml +++ b/qa/suites/upgrade/jewel-x/point-to-point-x/point-to-point-upgrade.yaml @@ -14,7 +14,6 @@ overrides: log-whitelist: - reached quota - scrub - - osd_map_max_advance - wrongly marked fs: xfs conf: -- 2.39.5