Skip to content

Commit

Permalink
osd: revert PR#57582
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
ronen-fr committed Oct 29, 2024
1 parent c0451e1 commit 63c0649
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/osd/PeeringState.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3033,9 +3033,7 @@ void PeeringState::proc_primary_info(
ceph_assert(!is_primary());

update_history(oinfo.history);
bool has_scrub_error = (!info.stats.stats_invalid && info.stats.stats.sum.num_scrub_errors);
info.stats = oinfo.stats;
if (has_scrub_error) {
if (!info.stats.stats_invalid && info.stats.stats.sum.num_scrub_errors) {
info.stats.stats.sum.num_scrub_errors = 0;
info.stats.stats.sum.num_shallow_scrub_errors = 0;
info.stats.stats.sum.num_deep_scrub_errors = 0;
Expand Down

0 comments on commit 63c0649

Please sign in to comment.