From: Sage Weil <sage@redhat.com>
Date: Fri, 27 Feb 2015 01:17:32 +0000 (-0800)
Subject: Merge pull request #3803 from guangyy/wip-7737
X-Git-Tag: v9.0.0~243
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3734%2Fhead;p=ceph.git

Merge pull request #3803 from guangyy/wip-7737

osd: fix negative degraded objects during backfilling

Backport: hammer, giant, firefly
---

2d2f37d13877551ea43186a7ffcb27f899cb3bc6
diff --cc src/osd/PG.cc
index 97e46ddba048,cd671ca42602..7447ecca9638
--- a/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 =