]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Revert "osd: peering: detect when log source osd goes down"
authorSamuel Just <sam.just@inktank.com>
Thu, 2 Aug 2012 17:58:31 +0000 (10:58 -0700)
committerSamuel Just <sam.just@inktank.com>
Thu, 2 Aug 2012 18:00:42 +0000 (11:00 -0700)
This reverts commit 0d3d75ec0d17e2f6bc5d42058f51eb2ff19ffb71.

Accidental double push.

src/osd/PG.cc

index 99c8fdde064953b17e280f8536b73550b9ca7f97..5b49ff7dfd912353e289d5a52b3f67363d197e48 100644 (file)
@@ -5231,21 +5231,6 @@ boost::statechart::result PG::RecoveryState::GetLog::react(const AdvMap& advmap)
   return forward_event();
 }
 
-boost::statechart::result PG::RecoveryState::GetLog::react(const AdvMap& advmap)
-{
-  // make sure our log source didn't go down.  we need to check
-  // explicitly because it may not be part of the prior set, which
-  // means the Peering state check won't catch it going down.
-  if (!advmap.osdmap->is_up(newest_update_osd)) {
-    dout(10) << "GetLog: newest_update_osd osd." << newest_update_osd << " went down" << dendl;
-    post_event(advmap);
-    return transit< Reset >();
-  }
-
-  // let the Peering state do its checks.
-  return forward_event();
-}
-
 boost::statechart::result PG::RecoveryState::GetLog::react(const MLogRec& logevt)
 {
   assert(!msg);