journaler: remove obsolete journaler_cache thing

This is ancient code used for testing impact of journal IO, no longer
useful.

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

diff --git a/src/common/config.cc b/src/common/config.cc
index b9c67bdc3c82315147c1da72388b4e7ffa3065e8..8e7bad3e4c724ec49cd8723b9913aeabbd560511 100644 (file)
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -215,7 +215,6 @@ struct config_option config_optionsp[] = {
   OPTION(objecter_inflight_op_bytes, 0, OPT_LONGLONG, 1024*1024*100), //max in-flight data (both directions)
   OPTION(journaler_allow_split_entries, 0, OPT_BOOL, true),
   OPTION(journaler_write_head_interval, 0, OPT_INT, 15),
-  OPTION(journaler_cache, 0, OPT_BOOL, false), // cache writes for later readback
   OPTION(journaler_prefetch_periods, 0, OPT_INT, 10),   // * journal object size (1~MB? see above)
   OPTION(journaler_batch_interval, 0, OPT_DOUBLE, .001),   // seconds.. max add'l latency we artificially incur
   OPTION(journaler_batch_max, 0, OPT_LONGLONG, 0),  // max bytes we'll delay flushing; disable, for now....

diff --git a/src/common/config.h b/src/common/config.h
index d88804f451193a76980fec09e9201da55ac6ff3e..49802285df31ad43a8a7fece53b783497ef74a9b 100644 (file)
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -227,7 +227,6 @@ struct md_config_t
   // journaler
   bool  journaler_allow_split_entries;
   int   journaler_write_head_interval;
-  bool  journaler_cache;
   int   journaler_prefetch_periods;
   double journaler_batch_interval;
   long long unsigned journaler_batch_max;

diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc
index f17772a60100b558ffb1b93b27901705932779bd..27a2cb606a06fe3eea6fdafaaf7b63ab837fdaca 100644 (file)
--- a/src/osdc/Journaler.cc
+++ b/src/osdc/Journaler.cc
@@ -429,19 +429,6 @@ uint64_t Journaler::append_entry(bufferlist& bl)
        
   dout(10) << "append_entry len " << bl.length() << " to " << write_pos << "~" << (bl.length() + sizeof(uint32_t)) << dendl;
   
-  // cache?
-  //  NOTE: this is a dumb thing to do; this is used for a benchmarking
-  //   purposes only.
-  if (g_conf.journaler_cache &&
-      write_pos == read_pos + read_buf.length()) {
-    dout(10) << "append_entry caching in read_buf too" << dendl;
-    assert(requested_pos == received_pos);
-    assert(requested_pos == read_pos + read_buf.length());
-    ::encode(s, read_buf);
-    read_buf.append(bl);
-    requested_pos = received_pos = write_pos + sizeof(s) + s;
-  }
-
   // append
   ::encode(s, write_buf);
   write_buf.claim_append(bl);