From: Sage Weil <sage.weil@dreamhost.com>
Date: Sun, 24 Jul 2011 21:45:38 +0000 (-0700)
Subject: mds: kill useless MDLog::writing_subtree_map
X-Git-Tag: v0.32~16
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=da689c068617abdf7690e20d49ee9a8b65dbe197;p=ceph.git

mds: kill useless MDLog::writing_subtree_map

No reason we can't have multiple maps in flight to the journal.  This looks
like baggage from when subtree_map_expire_waiters was used.

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
---

diff --git a/src/mds/MDLog.cc b/src/mds/MDLog.cc
index 9507baddfdc2..91233eaf705d 100644
--- a/src/mds/MDLog.cc
+++ b/src/mds/MDLog.cc
@@ -208,7 +208,6 @@ void MDLog::submit_entry(LogEvent *le, Context *c)
   uint64_t last_seg = get_last_segment_offset();
   uint64_t period = journaler->get_layout_period();
   if (!segments.empty() && 
-      !writing_subtree_map &&
       (journaler->get_write_pos()/period != last_seg/period &&
        journaler->get_write_pos() - last_seg > period/2)) {
     dout(10) << "submit_entry also starting new segment: last = " << last_seg
@@ -249,14 +248,11 @@ void MDLog::cap()
 void MDLog::start_new_segment(Context *onsync)
 {
   dout(7) << "start_new_segment at " << journaler->get_write_pos() << dendl;
-  assert(!writing_subtree_map);
 
   segments[journaler->get_write_pos()] = new LogSegment(journaler->get_write_pos());
 
-  writing_subtree_map = true;
-
   ESubtreeMap *le = mds->mdcache->create_subtree_map();
-  submit_entry(le, new C_MDL_WroteSubtreeMap(this, mds->mdlog->get_write_pos()));
+  submit_entry(le);
   if (onsync) {
     wait_for_safe(onsync);  
     flush();
@@ -271,20 +267,6 @@ void MDLog::start_new_segment(Context *onsync)
   mds->mdcache->advance_stray();
 }
 
-void MDLog::_logged_subtree_map(uint64_t off)
-{
-  dout(10) << "_logged_subtree_map at " << off << dendl;
-  writing_subtree_map = false;
-
-  /*
-  list<Context*> ls;
-  take_subtree_map_expire_waiters(ls);
-  mds->queue_waiters(ls);
-  */
-}
-
-
-
 void MDLog::trim(int m)
 {
   int max_segments = g_conf->mds_log_max_segments;
diff --git a/src/mds/MDLog.h b/src/mds/MDLog.h
index 73a156f2c414..d062a21d5f38 100644
--- a/src/mds/MDLog.h
+++ b/src/mds/MDLog.h
@@ -105,21 +105,7 @@ protected:
   int expiring_events;
   int expired_events;
 
-  class C_MDL_WroteSubtreeMap : public Context {
-    MDLog *mdlog;
-    uint64_t off;
-  public:
-    C_MDL_WroteSubtreeMap(MDLog *l, loff_t o) : mdlog(l), off(o) { }
-    void finish(int r) {
-      mdlog->_logged_subtree_map(off);
-    }
-  };
-  void _logged_subtree_map(uint64_t off);
-
-
   // -- subtreemaps --
-  bool writing_subtree_map;  // one is being written now
-
   friend class ESubtreeMap;
   friend class C_MDS_WroteImportMap;
   friend class MDCache;
@@ -160,7 +146,6 @@ public:
 		  replay_thread(this),
 		  already_replayed(false),
 		  expiring_events(0), expired_events(0),
-		  writing_subtree_map(false),
 		  cur_event(NULL) { }		  
   ~MDLog();