Skip to content

Commit 63c0649

Browse files
committed
osd: revert PR#57582
The reverted commit unconditionally copies the Info data from the primary-info message to the replica, causing multiple tests failures. For example: compare the failures in https://pulpito.ceph.com/?branch=wip-rf-store2-steps to https://pulpito.ceph.com/?branch=wip-rf-store2-steps-reverted (with said PR reverted). Revert "src/osd: pg stat are not synced between osds after deep-scrub. So if primary osd is killed, next primary osd has wrong stats. Reason behind it is PeeringState::proc_primary_info does not process or update any pg stats." This reverts commit a24f3cf. Signed-off-by: Ronen Friedman <[email protected]>
1 parent c0451e1 commit 63c0649

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

src/osd/PeeringState.cc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3033,9 +3033,7 @@ void PeeringState::proc_primary_info(
30333033
ceph_assert(!is_primary());
30343034

30353035
update_history(oinfo.history);
3036-
bool has_scrub_error = (!info.stats.stats_invalid && info.stats.stats.sum.num_scrub_errors);
3037-
info.stats = oinfo.stats;
3038-
if (has_scrub_error) {
3036+
if (!info.stats.stats_invalid && info.stats.stats.sum.num_scrub_errors) {
30393037
info.stats.stats.sum.num_scrub_errors = 0;
30403038
info.stats.stats.sum.num_shallow_scrub_errors = 0;
30413039
info.stats.stats.sum.num_deep_scrub_errors = 0;

0 commit comments

Comments
 (0)