osd: remove dead osd_max_opq code

This is no longer used as of a while ago!

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 5f4da5f65e45a9b81e6c1e9d6290abcca620d998..cdc577839e31ac9d9c515527c8808cc8905e5ad4 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -248,7 +248,6 @@ OPTION(osd_pool_default_pgp_num, OPT_INT, 8)
 OPTION(osd_map_cache_max, OPT_INT, 250)
 OPTION(osd_map_message_max, OPT_INT, 100)  // max maps per MOSDMap message
 OPTION(osd_op_threads, OPT_INT, 2)    // 0 == no threading
-OPTION(osd_max_opq, OPT_INT, 10)
 OPTION(osd_disk_threads, OPT_INT, 1)
 OPTION(osd_recovery_threads, OPT_INT, 1)
 OPTION(osd_op_thread_timeout, OPT_INT, 30)

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 8987f0d073f41b8fd0334f67b641ad38e7524d5c..f9ae5828ba5c637ca23be9f23445051304cb9585 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -5517,9 +5517,6 @@ void OSD::dequeue_op(PG *pg)
     dout(10) << "dequeue_op " << op << " finish" << dendl;
     assert(pending_ops > 0);
     
-    if (pending_ops > g_conf->osd_max_opq) 
-      op_queue_cond.Signal();
-    
     pending_ops--;
     logger->set(l_osd_opq, pending_ops);
     if (pending_ops == 0 && waiting_for_no_ops)

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index e6f4a037436a464287226414286f7dc845343ff7..7d94035a7176708217e145bc55ecb623a99fe9dc 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -359,7 +359,6 @@ private:
   int   pending_ops;
   bool  waiting_for_no_ops;
   Cond  no_pending_ops;
-  Cond  op_queue_cond;
   
   void wait_for_no_ops();
   void enqueue_op(PG *pg, Message *op);