osd: osd_tp -> peering_tp, osd_op_threads -> osd_peering_wq_threads

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

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index fc05447e86c9065d9e016231971374e0797e1eaf..0a67ef5ea99f6e9179dfba75339bd06eb1ffffba 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -749,7 +749,7 @@ OPTION(osd_inject_failure_on_pg_removal, OPT_BOOL, false)
 OPTION(osd_max_markdown_period , OPT_INT, 600)
 OPTION(osd_max_markdown_count, OPT_INT, 5)
 
-OPTION(osd_op_threads, OPT_INT, 2)    // 0 == no threading
+OPTION(osd_peering_wq_threads, OPT_INT, 2)
 OPTION(osd_peering_wq_batch_size, OPT_U64, 20)
 OPTION(osd_op_pq_max_tokens_per_priority, OPT_U64, 4194304)
 OPTION(osd_op_pq_min_cost, OPT_U64, 65536)

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 5b8b9b402172a8d2cdfe548756225138bea00f69..3babbe3f0114e0e3a7bb8ff3d7d8541d66f9d1b5 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1877,7 +1877,9 @@ OSD::OSD(CephContext *cct_, ObjectStore *store_,
   trace_endpoint("0.0.0.0", 0, "osd"),
   asok_hook(NULL),
   osd_compat(get_osd_compat_set()),
-  osd_tp(cct, "OSD::osd_tp", "tp_osd", cct->_conf->osd_op_threads, "osd_op_threads"),
+  peering_tp(cct, "OSD::peering_tp", "tp_peering",
+            cct->_conf->osd_peering_wq_threads,
+            "osd_peering_tp_threads"),
   osd_op_tp(cct, "OSD::osd_op_tp", "tp_osd_tp",
     cct->_conf->osd_op_num_threads_per_shard * cct->_conf->osd_op_num_shards),
   disk_tp(cct, "OSD::disk_tp", "tp_osd_disk", cct->_conf->osd_disk_threads, "osd_disk_threads"),
@@ -1908,7 +1910,7 @@ OSD::OSD(CephContext *cct_, ObjectStore *store_,
     this,
     cct->_conf->osd_op_thread_timeout,
     cct->_conf->osd_op_thread_suicide_timeout,
-    &osd_tp),
+    &peering_tp),
   map_lock("OSD::map_lock"),
   pg_map_lock("OSD::pg_map_lock"),
   last_pg_create_epoch(0),
@@ -2500,7 +2502,7 @@ int OSD::init()
   monc->set_log_client(&log_client);
   update_log_config();
 
-  osd_tp.start();
+  peering_tp.start();
   osd_op_tp.start();
   disk_tp.start();
   command_tp.start();
@@ -3195,9 +3197,9 @@ int OSD::shutdown()
   heartbeat_lock.Unlock();
   heartbeat_thread.join();
 
-  osd_tp.drain();
+  peering_tp.drain();
   peering_wq.clear();
-  osd_tp.stop();
+  peering_tp.stop();
   dout(10) << "osd tp stopped" << dendl;
 
   osd_op_tp.drain();

diff --git a/src/osd/OSD.h b/src/osd/OSD.h
index 6d147631f4cf02ae7f80ca2236058c298a51e99b..49f17fdf413519c84fcf9b12c7a298f5bc54295a 100644 (file)
--- a/src/osd/OSD.h
+++ b/src/osd/OSD.h
@@ -1462,7 +1462,7 @@ public:
 
 private:
 
-  ThreadPool osd_tp;
+  ThreadPool peering_tp;
   ShardedThreadPool osd_op_tp;
   ThreadPool disk_tp;
   ThreadPool command_tp;

diff --git a/src/test/test_workqueue.cc b/src/test/test_workqueue.cc
index ea19d060ee3b6bc0c5e6f3658f48815f318d9f63..e1787fe9034c8a5939ab908759119d3c5a706896 100644 (file)
--- a/src/test/test_workqueue.cc
+++ b/src/test/test_workqueue.cc
@@ -18,34 +18,34 @@ TEST(WorkQueue, StartStop)
 
 TEST(WorkQueue, Resize)
 {
-  ThreadPool tp(g_ceph_context, "bar", "tp_bar", 2, "osd_op_threads");
+  ThreadPool tp(g_ceph_context, "bar", "tp_bar", 2, "osd_peering_wq_threads");
   
   tp.start();
 
   sleep(1);
   ASSERT_EQ(2, tp.get_num_threads());
 
-  g_conf->set_val("osd op threads", "5");
+  g_conf->set_val("osd peering wq threads", "5");
   g_conf->apply_changes(&cout);
   sleep(1);
   ASSERT_EQ(5, tp.get_num_threads());
 
-  g_conf->set_val("osd op threads", "3");
+  g_conf->set_val("osd peering wq threads", "3");
   g_conf->apply_changes(&cout);
   sleep(1);
   ASSERT_EQ(3, tp.get_num_threads());
 
-  g_conf->set_val("osd op threads", "0");
+  g_conf->set_val("osd peering wq threads", "0");
   g_conf->apply_changes(&cout);
   sleep(1);
   ASSERT_EQ(0, tp.get_num_threads());
 
-  g_conf->set_val("osd op threads", "15");
+  g_conf->set_val("osd peering wq threads", "15");
   g_conf->apply_changes(&cout);
   sleep(1);
   ASSERT_EQ(15, tp.get_num_threads());
 
-  g_conf->set_val("osd op threads", "-1");
+  g_conf->set_val("osd peering wq threads", "-1");
   g_conf->apply_changes(&cout);
   sleep(1);
   ASSERT_EQ(15, tp.get_num_threads());