Merge pull request #3803 from guangyy/wip-7737

osd: fix negative degraded objects during backfilling

Backport: hammer, giant, firefly

diff --cc src/osd/PG.cc
index 97e46ddba048cf272916b2479016e4a88e788a1b,cd671ca42602be43ded619360c3a2e10c54af0b6..7447ecca9638970fbcfd975a53b0ca83513cf74d
--- 1/src/osd/PG.cc
--- 2/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@@ -2298,11 -2297,11 +2298,11 @@@ void PG::_update_calc_stats(
  
      // a degraded objects has fewer replicas or EC shards than the
      // pool specifies
-     uint64_t degraded = 0;
+     int64_t degraded = 0;
  
      // if acting is smaller than desired, add in those missing replicas
 -    if (acting.size() < target)
 -      degraded += (target - acting.size()) * num_objects;
 +    if (actingset.size() < target)
 +      degraded += (target - actingset.size()) * num_objects;
  
      // missing on primary
      info.stats.stats.sum.num_objects_missing_on_primary =