Skip to content

Commit 07555ce

Browse files
authored
Merge pull request ceph#60540 from ronen-fr/wip-rf-revert-57582
osd: revert PR#57582 Reviewed-by: Samuel Just <[email protected]>
2 parents ad7c409 + 63c0649 commit 07555ce

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)