From: Guang Yang <yguang@yahoo-inc.com>
Date: Mon, 13 Oct 2014 04:18:45 +0000 (+0000)
Subject: The fix for issue 9614 was not completed, as a result, for those erasure coded PGs... 
X-Git-Tag: v0.87~18^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F2711%2Fhead;p=ceph.git

The fix for issue 9614 was not completed, as a result, for those erasure coded PGs with one OSD down, the state was wrongly marked as active+clean+degraded. This patch makes sure the clean flag is not set for such PG.
Signed-off-by: Guang Yang <yguang@yahoo-inc.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index c9cb75645ce6..49752edfdd22 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1895,7 +1895,7 @@ void PG::mark_clean()
 {
   // only mark CLEAN if we have the desired number of replicas AND we
   // are not remapped.
-  if (acting.size() == get_osdmap()->get_pg_size(info.pgid.pgid) &&
+  if (actingset.size() == get_osdmap()->get_pg_size(info.pgid.pgid) &&
       up == acting)
     state_set(PG_STATE_CLEAN);