]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: clear RECOVERING on start_peering_interval
authorSage Weil <sage@newdream.net>
Wed, 28 Mar 2012 16:50:00 +0000 (09:50 -0700)
committerSage Weil <sage@newdream.net>
Fri, 30 Mar 2012 15:49:16 +0000 (08:49 -0700)
This prevents us from, say, getting into a recovering+stray state.

Signed-off-by: Sage Weil <sage@newdream.net>
src/osd/PG.cc

index 48abb0ba5638be302c03393907bdd08d4330c34c..69b16a695887e8e0c6ad5ce90a7097e435de6806 100644 (file)
@@ -3540,6 +3540,7 @@ void PG::start_peering_interval(const OSDMapRef lastmap,
   // deactivate.
   state_clear(PG_STATE_ACTIVE);
   state_clear(PG_STATE_DOWN);
+  state_clear(PG_STATE_RECOVERING);
 
   peer_missing.clear();