fixed an osd recovery bug

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@1729 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/trunk/ceph/mon/PGMonitor.cc b/trunk/ceph/mon/PGMonitor.cc
index 93254b0f1732c9225f46fbc2612dc7cb2e4a6c23..a87dbd49d3ee19d0c2b9818616fd3b843bc13e46 100644 (file)
--- a/trunk/ceph/mon/PGMonitor.cc
+++ b/trunk/ceph/mon/PGMonitor.cc
@@ -198,7 +198,7 @@ bool PGMonitor::handle_pg_stats(MPGStats *stats)
       continue;
     }
 
-    dout(-15) << " got " << pgid << " reported at " << p->second.reported 
+    dout(15) << " got " << pgid << " reported at " << p->second.reported 
             << " state " << PG::get_state_string(p->second.state)
             << dendl;
     pending_inc.pg_stat_updates[pgid] = p->second;

diff --git a/trunk/ceph/osd/OSD.cc b/trunk/ceph/osd/OSD.cc
index 76b6c451d4180f68b042bd6c6f025c2e46e05d47..3dcf3b0de26dacf47824d2b7acf7f9c404ac82e7 100644 (file)
--- a/trunk/ceph/osd/OSD.cc
+++ b/trunk/ceph/osd/OSD.cc
@@ -1604,7 +1604,8 @@ void OSD::handle_pg_notify(MOSDPGNotify *m)
       pg->set_role(role);
       pg->info.history = history;
       pg->last_epoch_started_any = it->last_epoch_started;
-      pg->build_prior();
+      pg->clear_primary_state();  // yep, notably, set hml=false
+      pg->build_prior();      
       pg->write_log(t);
       
       dout(10) << *pg << " is new" << dendl;

diff --git a/trunk/ceph/osdc/Objecter.cc b/trunk/ceph/osdc/Objecter.cc
index 78a4bdaf30bb346daddfdf8c8cf25606674924d9..f19676a9b21fb1f34349bb28316751cdb4444f03 100644 (file)
--- a/trunk/ceph/osdc/Objecter.cc
+++ b/trunk/ceph/osdc/Objecter.cc
@@ -261,7 +261,7 @@ void Objecter::kick_requests(set<pg_t>& changed_pgs)
 
 void Objecter::tick()
 {
-  dout(-10) << "tick" << dendl;
+  dout(10) << "tick" << dendl;
 
   // look for laggy pgs
   utime_t cutoff = g_clock.now();
@@ -271,7 +271,7 @@ void Objecter::tick()
        i++) {
     if (!i->second.active_tids.empty() &&
        i->second.last < cutoff) {
-      dout(-10) << "tick pg " << i->first << " is laggy" << dendl;
+      dout(10) << "tick pg " << i->first << " is laggy" << dendl;
       maybe_request_map();
       break;
     }