osd: take osd_lock in generate_backlog before peer()

Peer() uses the osd.timer to schedule the replay interval, which
needs osd_lock.

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index a3bea8650f50e3f87f779a3b18180f825a4e07a7..523c94bfe21cf92ac7a0def1717f196100ef5a83 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3133,13 +3133,15 @@ void OSD::generate_backlog(PG *pg)
 
   pg->assemble_backlog(omap);
   
+  // take osd_lock, map_log (read)
   pg->unlock();
+  osd_lock.Lock();
   map_lock.get_read();
   pg->lock();
 
   if (!pg->generate_backlog_epoch) {
     dout(10) << *pg << " generate_backlog aborting" << dendl;
-    goto out;
+    goto out2;
   }
 
   if (!pg->is_primary()) {
@@ -3163,8 +3165,10 @@ void OSD::generate_backlog(PG *pg)
       pg->write_log(t);
     store->apply_transaction(t);
   }
-  
+
+ out2:
   map_lock.put_read();
+  osd_lock.Unlock();
 
  out:
   pg->unlock();