From a5b8c8518fa0a0bbcd8313d5167a2789cae547c3 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 14 Nov 2011 12:15:14 -0800 Subject: [PATCH] osd: remove dead osd_max_opq code This is no longer used as of a while ago! Signed-off-by: Sage Weil --- src/common/config_opts.h | 1 - src/osd/OSD.cc | 3 --- src/osd/OSD.h | 1 - 3 files changed, 5 deletions(-) diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 5f4da5f65e45a..cdc577839e31a 100644 --- 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 8987f0d073f41..f9ae5828ba5c6 100644 --- 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 e6f4a037436a4..7d94035a71767 100644 --- 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); -- 2.39.5