Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

osd: drop unused osd_disk_tp related options #21339

Merged
merged 1 commit into from
Apr 27, 2018
Merged

osd: drop unused osd_disk_tp related options #21339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/common/options.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2275,10 +2275,6 @@ std::vector<Option> get_global_options() {
.set_default(65536)
.set_description(""),

Option("osd_disk_threads", Option::TYPE_INT, Option::LEVEL_ADVANCED)
.set_default(1)
.set_description(""),

Option("osd_recover_clone_overlap", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
.set_default(true)
.set_description(""),
Expand Down
3 changes: 0 additions & 3 deletions src/osd/OSD.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@
#include "common/ceph_argparse.h"
#include "common/ceph_time.h"
#include "common/version.h"
#include "common/io_priority.h"
#include "common/pick_address.h"
#include "common/SubProcess.h"
#include "common/PluginRegistry.h"
Expand Down Expand Up @@ -8960,8 +8959,6 @@ const char** OSD::get_tracked_conf_keys() const
"osd_map_cache_size",
"osd_pg_epoch_max_lag_factor",
"osd_pg_epoch_persisted_max_stale",
"osd_disk_thread_ioprio_class",
"osd_disk_thread_ioprio_priority",
// clog & admin clog
"clog_to_monitors",
"clog_to_syslog",
Expand Down
12 changes: 6 additions & 6 deletions src/test/test_workqueue.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,34 +18,34 @@ TEST(WorkQueue, StartStop)

TEST(WorkQueue, Resize)
{
ThreadPool tp(g_ceph_context, "bar", "tp_bar", 2, "osd_disk_threads");
ThreadPool tp(g_ceph_context, "bar", "tp_bar", 2, "filestore_op_threads");

tp.start();

sleep(1);
ASSERT_EQ(2, tp.get_num_threads());

g_conf->set_val("osd disk threads", "5");
g_conf->set_val("filestore op threads", "5");
g_conf->apply_changes(&cout);
sleep(1);
ASSERT_EQ(5, tp.get_num_threads());

g_conf->set_val("osd disk threads", "3");
g_conf->set_val("filestore op threads", "3");
g_conf->apply_changes(&cout);
sleep(1);
ASSERT_EQ(3, tp.get_num_threads());

g_conf->set_val("osd disk threads", "0");
g_conf->set_val("filestore op threads", "0");
g_conf->apply_changes(&cout);
sleep(1);
ASSERT_EQ(0, tp.get_num_threads());

g_conf->set_val("osd disk threads", "15");
g_conf->set_val("filestore op threads", "15");
g_conf->apply_changes(&cout);
sleep(1);
ASSERT_EQ(15, tp.get_num_threads());

g_conf->set_val("osd disk threads", "-1");
g_conf->set_val("filestore op threads", "-1");
g_conf->apply_changes(&cout);
sleep(1);
ASSERT_EQ(15, tp.get_num_threads());
Expand Down