]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
osd: distinguish between osd_pg_stat_report_max_(epoch|seconds)
authorzhangjianwei2 <zhangjianwei2_yewu@cmss.chinamobile.com>
Tue, 14 Nov 2023 08:45:43 +0000 (16:45 +0800)
committerzhangjianwei2 <zhangjianwei2_yewu@cmss.chinamobile.com>
Thu, 23 Nov 2023 01:29:09 +0000 (09:29 +0800)
commit629cb3232d1e0dc2172d24602286bcfec9ef0323
treeece1e2f9a673db14cbb4f4020dcd171f40aa9b98
parent7325a8d317d1cef199306833e7829b171378266b
osd: distinguish between osd_pg_stat_report_max_(epoch|seconds)

osd_pg_stat_report_max was previously used as either a max time in seconds
or a max number of epochs.  Instead, separate into two configs and adjust
PeeringState::prepare_stats_for_publish to check both.

Additionally, this commit removes a superfluous check in
PeeringState::Active::react(const AdvMap&) and calls publish_stats_to_osd
unconditionally as with other callers in PeeringState.

Fixes: https://tracker.ceph.com/issues/63520
Signed-off-by: zhangjianwei2 <zhangjianwei2@cmss.chinamobile.com>
qa/standalone/scrub/osd-scrub-snaps.sh
qa/standalone/scrub/scrub-helpers.sh
src/common/options/global.yaml.in
src/osd/PeeringState.cc