From fc7ec60c7f9211e9f1653c8933de8fbeca6bacef Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Thu, 18 Jun 2009 16:37:44 -0700 Subject: [PATCH] osd: we don't use MOSDPGInfo to signal replica uptodate anymore Clean out cruft from old replica-driven recovery. --- src/osd/OSD.cc | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 93a74aaba4849..9599cb9f9dea0 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -2889,22 +2889,12 @@ void OSD::handle_pg_notify(MOSDPGNotify *m) } if (had) { - if (pg->is_active() && - (*it).is_uptodate() && - acting) { - pg->uptodate_set.insert(from); - dout(10) << *pg << " osd" << from << " now uptodate (" << pg->uptodate_set - << "): " << *it << dendl; - } else { - // hmm, maybe keep an eye out for cases where we see this, but peer should happen. - dout(10) << *pg << " already had notify info from osd" << from << ": " << *it << dendl; - } - if (pg->is_all_uptodate()) - pg->finish_recovery(); + // hmm, maybe keep an eye out for cases where we see this, but peer should happen. + dout(10) << *pg << " hmm, already had notify info from osd" << from << ": " << *it << dendl; } else { pg->peer(t, query_map, &info_map); + pg->update_stats(); } - pg->update_stats(); pg->unlock(); } -- 2.39.5