Merge pull request ceph#60540 from ronen-fr/wip-rf-revert-57582

osd: revert PR#57582 Reviewed-by: Samuel Just <[email protected]>
smanjara · Oct 31, 2024 · 07555ce · 07555ce
2 parents ad7c409 + 63c0649
commit 07555ce
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/osd/PeeringState.cc b/src/osd/PeeringState.cc
@@ -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;