From 6a4a707cdd8136adefbcaf6ea82fee5991a99543 Mon Sep 17 00:00:00 2001 From: Colin Patrick McCabe Date: Fri, 9 Sep 2011 09:28:18 -0700 Subject: [PATCH] osd/OSD.cc: use set_val / apply_changes API Signed-off-by: Colin McCabe --- src/osd/OSD.cc | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 17fa3bd7603a1..3fb5584a880e2 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -792,10 +792,11 @@ void OSD::create_logger() int OSD::shutdown() { - g_conf->debug_osd = 100; - g_conf->debug_journal = 100; - g_conf->debug_filestore = 100; - g_conf->debug_ms = 100; + g_ceph_context->_conf->set_val("debug_osd", "100"); + g_ceph_context->_conf->set_val("debug_journal", "100"); + g_ceph_context->_conf->set_val("debug_filestore", "100"); + g_ceph_context->_conf->set_val("debug_ms", "100"); + g_ceph_context->_conf->apply_changes(NULL); derr << "OSD::shutdown" << dendl; @@ -2333,13 +2334,20 @@ void OSD::handle_command(MMonCommand *m) fout.close(); } else if (m->cmd.size() == 3 && m->cmd[1] == "kick_recovery_wq") { - g_conf->osd_recovery_delay_start = atoi(m->cmd[2].c_str()); - clog.info() << "kicking recovery queue. set osd_recovery_delay_start " - << "to " << g_conf->osd_recovery_delay_start << "\n"; - - defer_recovery_until = ceph_clock_now(g_ceph_context); - defer_recovery_until += g_conf->osd_recovery_delay_start; - recovery_wq.kick(); + int r = g_conf->set_val("osd_recovery_delay_start", m->cmd[2].c_str()); + if (r != 0) { + clog.info() << "kick_recovery_wq: error setting " + << "osd_recovery_delay_start to '" << m->cmd[2] << "': error " + << r << "\n"; + } + else { + g_conf->apply_changes(NULL); + clog.info() << "kicking recovery queue. set osd_recovery_delay_start " + << "to " << g_conf->osd_recovery_delay_start << "\n"; + defer_recovery_until = ceph_clock_now(g_ceph_context); + defer_recovery_until += g_conf->osd_recovery_delay_start; + recovery_wq.kick(); + } } } else if (m->cmd[0] == "cpu_profiler") { -- 2.39.5