osd: only set CLEAN when we are not remapped (up == acting)

If we have a temporary mapping for this PG, consider that unclean. This makes CLEAN and REMAPPED mutually exclusive. For example, a 2 node cluster with 2x replication and one osd marked out will make the pgs all active+remapped, not active+clean+remapped. Fixes: ceph#2094 Signed-off-by: Sage Weil <[email protected]>
zmc · Feb 23, 2012 · e8bc42f · e8bc42f
1 parent d8df565
commit e8bc42f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/osd/PG.cc b/src/osd/PG.cc
@@ -1538,8 +1538,10 @@ void PG::finish_recovery(ObjectStore::Transaction& t, list<Context*>& tfin)
   state_clear(PG_STATE_BACKFILL);
   state_clear(PG_STATE_RECOVERING);
 
-  // only mark CLEAN if we have the desired number of replicas.
-  if (acting.size() == get_osdmap()->get_pg_size(info.pgid))
+  // 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) &&
+      up == acting)
     state_set(PG_STATE_CLEAN);
 
   assert(info.last_complete == info.last_update);