From 5d5b0f96df39fd0c7e7ae5998043d53cd785b18e Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Fri, 31 Jan 2020 18:59:39 +0800 Subject: [PATCH] src/: drop cct from cmd_getval() it's not used. Signed-off-by: Kefu Chai --- src/common/admin_socket.cc | 4 +- src/common/ceph_context.cc | 22 +-- src/common/cmdparse.cc | 4 +- src/common/cmdparse.h | 6 +- src/mds/MDSDaemon.cc | 6 +- src/mds/MDSRank.cc | 56 +++--- src/mgr/ClusterState.cc | 2 +- src/mgr/DaemonServer.cc | 64 +++--- src/mon/AuthMonitor.cc | 16 +- src/mon/ConfigKeyService.cc | 8 +- src/mon/ConfigMonitor.cc | 24 +-- src/mon/FSCommands.cc | 46 ++--- src/mon/HealthMonitor.cc | 16 +- src/mon/LogMonitor.cc | 14 +- src/mon/MDSMonitor.cc | 52 ++--- src/mon/MgrMonitor.cc | 24 +-- src/mon/Monitor.cc | 38 ++-- src/mon/MonmapMonitor.cc | 32 +-- src/mon/OSDMonitor.cc | 374 ++++++++++++++++++------------------ src/mon/PGMap.cc | 16 +- src/os/bluestore/BlueFS.cc | 2 +- src/osd/OSD.cc | 60 +++--- src/osd/PrimaryLogPG.cc | 10 +- src/test/admin_socket.cc | 4 +- 24 files changed, 450 insertions(+), 450 deletions(-) diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc index 4d3886fa3f2cb..90a1f84ae4eed 100644 --- a/src/common/admin_socket.cc +++ b/src/common/admin_socket.cc @@ -481,8 +481,8 @@ void AdminSocket::execute_command( } string prefix; try { - cmd_getval(m_cct, cmdmap, "format", format); - cmd_getval(m_cct, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "format", format); + cmd_getval(cmdmap, "prefix", prefix); } catch (const bad_cmd_get& e) { return on_finish(-EINVAL, "invalid json, missing format and/or prefix", empty); diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc index 64d58603d6102..9d10ad0887d8c 100644 --- a/src/common/ceph_context.cc +++ b/src/common/ceph_context.cc @@ -488,8 +488,8 @@ int CephContext::_do_command( command == "perf dump") { std::string logger; std::string counter; - cmd_getval(this, cmdmap, "logger", logger); - cmd_getval(this, cmdmap, "counter", counter); + cmd_getval(cmdmap, "logger", logger); + cmd_getval(cmdmap, "counter", counter); _perf_counters_collection->dump_formatted(f, false, logger, counter); } else if (command == "perfcounters_schema" || command == "2" || @@ -499,8 +499,8 @@ int CephContext::_do_command( else if (command == "perf histogram dump") { std::string logger; std::string counter; - cmd_getval(this, cmdmap, "logger", logger); - cmd_getval(this, cmdmap, "counter", counter); + cmd_getval(cmdmap, "logger", logger); + cmd_getval(cmdmap, "counter", counter); _perf_counters_collection->dump_formatted_histograms(f, false, logger, counter); } @@ -511,7 +511,7 @@ int CephContext::_do_command( std::string var; std::string section(command); f->open_object_section(section.c_str()); - if (!cmd_getval(this, cmdmap, "var", var)) { + if (!cmd_getval(cmdmap, "var", var)) { f->dump_string("error", "syntax error: 'perf reset '"); } else { if(!_perf_counters_collection->reset(var)) @@ -530,7 +530,7 @@ int CephContext::_do_command( } else if (command == "config unset") { std::string var; - if (!(cmd_getval(this, cmdmap, "var", var))) { + if (!(cmd_getval(cmdmap, "var", var))) { r = -EINVAL; } else { r = _conf.rm_val(var.c_str()); @@ -548,8 +548,8 @@ int CephContext::_do_command( std::string var; std::vector val; - if (!(cmd_getval(this, cmdmap, "var", var)) || - !(cmd_getval(this, cmdmap, "val", val))) { + if (!(cmd_getval(cmdmap, "var", var)) || + !(cmd_getval(cmdmap, "val", val))) { r = -EINVAL; } else { // val may be multiple words @@ -566,7 +566,7 @@ int CephContext::_do_command( } } else if (command == "config get") { std::string var; - if (!cmd_getval(this, cmdmap, "var", var)) { + if (!cmd_getval(cmdmap, "var", var)) { r = -EINVAL; } else { char buf[4096]; @@ -582,7 +582,7 @@ int CephContext::_do_command( } } else if (command == "config help") { std::string var; - if (cmd_getval(this, cmdmap, "var", var)) { + if (cmd_getval(cmdmap, "var", var)) { // Output a single one std::string key = ConfFile::normalize_key_name(var); auto schema = _conf.get_schema(key); @@ -612,7 +612,7 @@ int CephContext::_do_command( } else if (command == "injectargs") { vector argsvec; - cmd_getval(this, cmdmap, "injected_args", argsvec); + cmd_getval(cmdmap, "injected_args", argsvec); if (!argsvec.empty()) { string args = joinify(argsvec.begin(), argsvec.end(), diff --git a/src/common/cmdparse.cc b/src/common/cmdparse.cc index 4a89eaaa69908..1827a13879895 100644 --- a/src/common/cmdparse.cc +++ b/src/common/cmdparse.cc @@ -558,7 +558,7 @@ bool validate_arg(CephContext* cct, { Value v; try { - if (!cmd_getval(cct, cmdmap, string(name), v)) { + if (!cmd_getval(cmdmap, string(name), v)) { if constexpr (is_vector) { // an empty list is acceptable. return true; @@ -631,7 +631,7 @@ bool validate_cmd(CephContext* cct, }); } -bool cmd_getval(CephContext *cct, const cmdmap_t& cmdmap, +bool cmd_getval(const cmdmap_t& cmdmap, const std::string& k, bool& val) { /* diff --git a/src/common/cmdparse.h b/src/common/cmdparse.h index af94352a0ebeb..d552556e41011 100644 --- a/src/common/cmdparse.h +++ b/src/common/cmdparse.h @@ -56,11 +56,11 @@ struct bad_cmd_get : public std::exception { } }; -bool cmd_getval(CephContext *cct, const cmdmap_t& cmdmap, +bool cmd_getval(const cmdmap_t& cmdmap, const std::string& k, bool& val); template -bool cmd_getval(CephContext *cct, const cmdmap_t& cmdmap, +bool cmd_getval(const cmdmap_t& cmdmap, const std::string& k, T& val) { if (cmdmap.count(k)) { @@ -78,7 +78,7 @@ bool cmd_getval(CephContext *cct, const cmdmap_t& cmdmap, template bool cmd_getval( - CephContext *cct, const cmdmap_t& cmdmap, const std::string& k, + const cmdmap_t& cmdmap, const std::string& k, T& val, const T& defval) { if (cmdmap.count(k)) { diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc index 4959210dec1c3..186712909ea5d 100644 --- a/src/mds/MDSDaemon.cc +++ b/src/mds/MDSDaemon.cc @@ -169,18 +169,18 @@ void MDSDaemon::asok_command( r = -EOPNOTSUPP; } else { string heapcmd; - cmd_getval(cct, cmdmap, "heapcmd", heapcmd); + cmd_getval(cmdmap, "heapcmd", heapcmd); vector heapcmd_vec; get_str_vec(heapcmd, heapcmd_vec); string value; - if (cmd_getval(cct, cmdmap, "value", value)) { + if (cmd_getval(cmdmap, "value", value)) { heapcmd_vec.push_back(value); } ceph_heap_profiler_handle_command(heapcmd_vec, ss); } } else if (command == "cpu_profiler") { string arg; - cmd_getval(cct, cmdmap, "arg", arg); + cmd_getval(cmdmap, "arg", arg); vector argvec; get_str_vec(arg, argvec); cpu_profiler_handle_command(argvec, ss); diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc index 34905d9da5769..e9accb557908a 100644 --- a/src/mds/MDSRank.cc +++ b/src/mds/MDSRank.cc @@ -2449,7 +2449,7 @@ void MDSRankDispatcher::handle_asok_command( } } else if (command == "osdmap barrier") { int64_t target_epoch = 0; - bool got_val = cmd_getval(g_ceph_context, cmdmap, "target_epoch", target_epoch); + bool got_val = cmd_getval(cmdmap, "target_epoch", target_epoch); if (!got_val) { ss << "no target epoch given"; @@ -2470,7 +2470,7 @@ void MDSRankDispatcher::handle_asok_command( command == "client ls") { std::lock_guard l(mds_lock); std::vector filter_args; - cmd_getval(g_ceph_context, cmdmap, "filters", filter_args); + cmd_getval(cmdmap, "filters", filter_args); SessionFilter filter; r = filter.parse(filter_args, &ss); if (r != 0) { @@ -2481,7 +2481,7 @@ void MDSRankDispatcher::handle_asok_command( command == "client evict") { std::lock_guard l(mds_lock); std::vector filter_args; - cmd_getval(g_ceph_context, cmdmap, "filters", filter_args); + cmd_getval(cmdmap, "filters", filter_args); SessionFilter filter; r = filter.parse(filter_args, &ss); @@ -2493,7 +2493,7 @@ void MDSRankDispatcher::handle_asok_command( return; } else if (command == "session kill") { std::string client_id; - if (!cmd_getval(g_ceph_context, cmdmap, "client_id", client_id)) { + if (!cmd_getval(cmdmap, "client_id", client_id)) { ss << "Invalid client_id specified"; r = -ENOENT; goto out; @@ -2511,9 +2511,9 @@ void MDSRankDispatcher::handle_asok_command( std::string option; std::string value; - cmd_getval(g_ceph_context, cmdmap, "client_id", client_id); - cmd_getval(g_ceph_context, cmdmap, "option", option); - bool got_value = cmd_getval(g_ceph_context, cmdmap, "value", value); + cmd_getval(cmdmap, "client_id", client_id); + cmd_getval(cmdmap, "option", option); + bool got_value = cmd_getval(cmdmap, "value", value); std::lock_guard l(mds_lock); r = config_client(client_id, !got_value, option, value, ss); @@ -2522,9 +2522,9 @@ void MDSRankDispatcher::handle_asok_command( string path; string tag; vector scrubop_vec; - cmd_getval(g_ceph_context, cmdmap, "scrubops", scrubop_vec); - cmd_getval(g_ceph_context, cmdmap, "path", path); - cmd_getval(g_ceph_context, cmdmap, "tag", tag); + cmd_getval(cmdmap, "scrubops", scrubop_vec); + cmd_getval(cmdmap, "path", path); + cmd_getval(cmdmap, "tag", tag); /* Multiple MDS scrub is not currently supported. See also: https://tracker.ceph.com/issues/12274 */ if (mdsmap->get_max_mds() > 1) { @@ -2583,13 +2583,13 @@ void MDSRankDispatcher::handle_asok_command( command_scrub_status(f); } else if (command == "tag path") { string path; - cmd_getval(g_ceph_context, cmdmap, "path", path); + cmd_getval(cmdmap, "path", path); string tag; - cmd_getval(g_ceph_context, cmdmap, "tag", tag); + cmd_getval(cmdmap, "tag", tag); command_tag_path(f, path, tag); } else if (command == "flush_path") { string path; - cmd_getval(g_ceph_context, cmdmap, "path", path); + cmd_getval(cmdmap, "path", path); command_flush_path(f, path); } else if (command == "flush journal") { command_flush_journal(f); @@ -2597,13 +2597,13 @@ void MDSRankDispatcher::handle_asok_command( command_get_subtrees(f); } else if (command == "export dir") { string path; - if(!cmd_getval(g_ceph_context, cmdmap, "path", path)) { + if(!cmd_getval(cmdmap, "path", path)) { ss << "malformed path"; r = -EINVAL; goto out; } int64_t rank; - if(!cmd_getval(g_ceph_context, cmdmap, "rank", rank)) { + if(!cmd_getval(cmdmap, "rank", rank)) { ss << "malformed rank"; r = -EINVAL; goto out; @@ -2612,14 +2612,14 @@ void MDSRankDispatcher::handle_asok_command( } else if (command == "dump cache") { std::lock_guard l(mds_lock); string path; - if (!cmd_getval(g_ceph_context, cmdmap, "path", path)) { + if (!cmd_getval(cmdmap, "path", path)) { r = mdcache->dump_cache(f); } else { r = mdcache->dump_cache(path); } } else if (command == "cache drop") { int64_t timeout = 0; - cmd_getval(g_ceph_context, cmdmap, "timeout", timeout); + cmd_getval(cmdmap, "timeout", timeout); finisher->queue( new LambdaContext( [this, on_finish, f, timeout](int r) { @@ -2643,7 +2643,7 @@ void MDSRankDispatcher::handle_asok_command( } else if (command == "dump snaps") { std::lock_guard l(mds_lock); string server; - cmd_getval(g_ceph_context, cmdmap, "server", server); + cmd_getval(cmdmap, "server", server); if (server == "--server") { if (mdsmap->get_tableserver() == whoami) { snapserver->dump(f); @@ -2673,7 +2673,7 @@ void MDSRankDispatcher::handle_asok_command( } else if (command == "damage rm") { std::lock_guard l(mds_lock); damage_entry_id_t id = 0; - if (!cmd_getval(g_ceph_context, cmdmap, "damage_id", (int64_t&)id)) { + if (!cmd_getval(cmdmap, "damage_id", (int64_t&)id)) { r = -EINVAL; goto out; } @@ -2909,8 +2909,8 @@ void MDSRank::command_dump_tree(const cmdmap_t &cmdmap, std::ostream &ss, Format { std::string root; int64_t depth; - cmd_getval(g_ceph_context, cmdmap, "root", root); - if (!cmd_getval(g_ceph_context, cmdmap, "depth", depth)) + cmd_getval(cmdmap, "root", root); + if (!cmd_getval(cmdmap, "depth", depth)) depth = -1; std::lock_guard l(mds_lock); CInode *in = mdcache->cache_traverse(filepath(root.c_str())); @@ -2928,14 +2928,14 @@ CDir *MDSRank::_command_dirfrag_get( std::ostream &ss) { std::string path; - bool got = cmd_getval(g_ceph_context, cmdmap, "path", path); + bool got = cmd_getval(cmdmap, "path", path); if (!got) { ss << "missing path argument"; return NULL; } std::string frag_str; - if (!cmd_getval(g_ceph_context, cmdmap, "frag", frag_str)) { + if (!cmd_getval(cmdmap, "frag", frag_str)) { ss << "missing frag argument"; return NULL; } @@ -2978,7 +2978,7 @@ bool MDSRank::command_dirfrag_split( { std::lock_guard l(mds_lock); int64_t by = 0; - if (!cmd_getval(g_ceph_context, cmdmap, "bits", by)) { + if (!cmd_getval(cmdmap, "bits", by)) { ss << "missing bits argument"; return false; } @@ -3004,14 +3004,14 @@ bool MDSRank::command_dirfrag_merge( { std::lock_guard l(mds_lock); std::string path; - bool got = cmd_getval(g_ceph_context, cmdmap, "path", path); + bool got = cmd_getval(cmdmap, "path", path); if (!got) { ss << "missing path argument"; return false; } std::string frag_str; - if (!cmd_getval(g_ceph_context, cmdmap, "frag", frag_str)) { + if (!cmd_getval(cmdmap, "frag", frag_str)) { ss << "missing frag argument"; return false; } @@ -3040,7 +3040,7 @@ bool MDSRank::command_dirfrag_ls( { std::lock_guard l(mds_lock); std::string path; - bool got = cmd_getval(g_ceph_context, cmdmap, "path", path); + bool got = cmd_getval(cmdmap, "path", path); if (!got) { ss << "missing path argument"; return false; @@ -3081,7 +3081,7 @@ void MDSRank::command_dump_inode(Formatter *f, const cmdmap_t &cmdmap, std::ostr { std::lock_guard l(mds_lock); int64_t number; - bool got = cmd_getval(g_ceph_context, cmdmap, "number", number); + bool got = cmd_getval(cmdmap, "number", number); if (!got) { ss << "missing inode number"; return; diff --git a/src/mgr/ClusterState.cc b/src/mgr/ClusterState.cc index a34fb1de82675..2b54a5c24025e 100644 --- a/src/mgr/ClusterState.cc +++ b/src/mgr/ClusterState.cc @@ -226,7 +226,7 @@ bool ClusterState::asok_command( if (admin_command == "dump_osd_network") { int64_t value = 0; // Default to health warning level if nothing specified - if (!(cmd_getval(g_ceph_context, cmdmap, "value", value))) { + if (!(cmd_getval(cmdmap, "value", value))) { // Convert milliseconds to microseconds value = static_cast(g_ceph_context->_conf.get_val("mon_warn_on_slow_ping_time")) * 1000; if (value == 0) { diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index f72ae5cfbc426..8bbac9651516d 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -657,7 +657,7 @@ void DaemonServer::_generate_command_map( continue; if (p->first == "caps") { vector cv; - if (cmd_getval(g_ceph_context, cmdmap, "caps", cv) && + if (cmd_getval(cmdmap, "caps", cv) && cv.size() % 2 == 0) { for (unsigned i = 0; i < cv.size(); i += 2) { string k = string("caps_") + cv[i]; @@ -867,12 +867,12 @@ bool DaemonServer::_handle_command( } { - cmd_getval(g_ceph_context, cmdctx->cmdmap, "format", format, string("plain")); + cmd_getval(cmdctx->cmdmap, "format", format, string("plain")); f.reset(Formatter::create(format)); } string prefix; - cmd_getval(cct, cmdctx->cmdmap, "prefix", prefix); + cmd_getval(cmdctx->cmdmap, "prefix", prefix); dout(10) << "decoded-size=" << cmdctx->cmdmap.size() << " prefix=" << prefix << dendl; @@ -991,8 +991,8 @@ bool DaemonServer::_handle_command( if (prefix == "config set") { std::string key; std::string val; - cmd_getval(cct, cmdctx->cmdmap, "key", key); - cmd_getval(cct, cmdctx->cmdmap, "value", val); + cmd_getval(cmdctx->cmdmap, "key", key); + cmd_getval(cmdctx->cmdmap, "value", val); r = cct->_conf.set_val(key, val, &ss); if (r == 0) { cct->_conf.apply_changes(nullptr); @@ -1011,7 +1011,7 @@ bool DaemonServer::_handle_command( pg_t pgid; spg_t spgid; string pgidstr; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "pgid", pgidstr); + cmd_getval(cmdctx->cmdmap, "pgid", pgidstr); if (!pgid.parse(pgidstr.c_str())) { ss << "invalid pgid '" << pgidstr << "'"; cmdctx->reply(-EINVAL, ss); @@ -1068,7 +1068,7 @@ bool DaemonServer::_handle_command( prefix == "osd deep-scrub" || prefix == "osd repair") { string whostr; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "who", whostr); + cmd_getval(cmdctx->cmdmap, "who", whostr); vector pvec; get_str_vec(prefix, pvec); @@ -1153,7 +1153,7 @@ bool DaemonServer::_handle_command( prefix == "osd pool deep-scrub" || prefix == "osd pool repair") { vector pool_names; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "who", pool_names); + cmd_getval(cmdctx->cmdmap, "who", pool_names); if (pool_names.empty()) { ss << "must specify one or more pool names"; cmdctx->reply(-EINVAL, ss); @@ -1226,10 +1226,10 @@ bool DaemonServer::_handle_command( prefix == "osd test-reweight-by-pg" || prefix == "osd test-reweight-by-utilization"; int64_t oload; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "oload", oload, int64_t(120)); + cmd_getval(cmdctx->cmdmap, "oload", oload, int64_t(120)); set pools; vector poolnames; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "pools", poolnames); + cmd_getval(cmdctx->cmdmap, "pools", poolnames); cluster_state.with_osdmap([&](const OSDMap& osdmap) { for (const auto& poolname : poolnames) { int64_t pool = osdmap.lookup_pg_pool_name(poolname); @@ -1246,21 +1246,21 @@ bool DaemonServer::_handle_command( } double max_change = g_conf().get_val("mon_reweight_max_change"); - cmd_getval(g_ceph_context, cmdctx->cmdmap, "max_change", max_change); + cmd_getval(cmdctx->cmdmap, "max_change", max_change); if (max_change <= 0.0) { ss << "max_change " << max_change << " must be positive"; cmdctx->reply(-EINVAL, ss); return true; } int64_t max_osds = g_conf().get_val("mon_reweight_max_osds"); - cmd_getval(g_ceph_context, cmdctx->cmdmap, "max_osds", max_osds); + cmd_getval(cmdctx->cmdmap, "max_osds", max_osds); if (max_osds <= 0) { ss << "max_osds " << max_osds << " must be positive"; cmdctx->reply(-EINVAL, ss); return true; } bool no_increasing = false; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "no_increasing", no_increasing); + cmd_getval(cmdctx->cmdmap, "no_increasing", no_increasing); string out_str; mempool::osdmap::map new_weights; r = cluster_state.with_osdmap_and_pgmap([&](const OSDMap &osdmap, const PGMap& pgmap) { @@ -1311,8 +1311,8 @@ bool DaemonServer::_handle_command( } } else if (prefix == "osd df") { string method, filter; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "output_method", method); - cmd_getval(g_ceph_context, cmdctx->cmdmap, "filter", filter); + cmd_getval(cmdctx->cmdmap, "output_method", method); + cmd_getval(cmdctx->cmdmap, "filter", filter); stringstream rs; r = cluster_state.with_osdmap_and_pgmap([&](const OSDMap& osdmap, const PGMap& pgmap) { // sanity check filter(s) @@ -1332,7 +1332,7 @@ bool DaemonServer::_handle_command( return true; } else if (prefix == "osd pool stats") { string pool_name; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "pool_name", pool_name); + cmd_getval(cmdctx->cmdmap, "pool_name", pool_name); int64_t poolid = -ENOENT; bool one_pool = false; r = cluster_state.with_osdmap_and_pgmap([&](const OSDMap& osdmap, const PGMap& pg_map) { @@ -1383,7 +1383,7 @@ bool DaemonServer::_handle_command( int r = 0; if (prefix == "osd safe-to-destroy") { vector ids; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "ids", ids); + cmd_getval(cmdctx->cmdmap, "ids", ids); cluster_state.with_osdmap([&](const OSDMap& osdmap) { r = osdmap.parse_osd_id_list(ids, &osds, &ss); }); @@ -1393,7 +1393,7 @@ bool DaemonServer::_handle_command( } } else { int64_t id; - if (!cmd_getval(g_ceph_context, cmdctx->cmdmap, "id", id)) { + if (!cmd_getval(cmdctx->cmdmap, "id", id)) { r = -EINVAL; ss << "must specify OSD id"; } else { @@ -1512,10 +1512,10 @@ bool DaemonServer::_handle_command( if (r) { bool force = false; - cmd_getval(cct, cmdctx->cmdmap, "force", force); + cmd_getval(cmdctx->cmdmap, "force", force); if (!force) { // Backward compat - cmd_getval(cct, cmdctx->cmdmap, "yes_i_really_mean_it", force); + cmd_getval(cmdctx->cmdmap, "yes_i_really_mean_it", force); } if (!force) { ss << "\nYou can proceed by passing --force, but be warned that" @@ -1539,7 +1539,7 @@ bool DaemonServer::_handle_command( return true; } else if (prefix == "osd ok-to-stop") { vector ids; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "ids", ids); + cmd_getval(cmdctx->cmdmap, "ids", ids); set osds; int r; cluster_state.with_osdmap([&](const OSDMap& osdmap) { @@ -1652,7 +1652,7 @@ bool DaemonServer::_handle_command( if (granularity == "pg") { // covnert pg names to pgs, discard any invalid ones while at it vector pgids; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "pgid", pgids); + cmd_getval(cmdctx->cmdmap, "pgid", pgids); for (auto& i : pgids) { pg_t pgid; if (!pgid.parse(i.c_str())) { @@ -1665,7 +1665,7 @@ bool DaemonServer::_handle_command( } else { // per pool vector pool_names; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "who", pool_names); + cmd_getval(cmdctx->cmdmap, "who", pool_names); if (pool_names.empty()) { ss << "must specify one or more pool names"; cmdctx->reply(-EINVAL, ss); @@ -1790,7 +1790,7 @@ bool DaemonServer::_handle_command( } else if (prefix == "config show" || prefix == "config show-with-defaults") { string who; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "who", who); + cmd_getval(cmdctx->cmdmap, "who", who); auto [key, valid] = DaemonKey::parse(who); if (!valid) { ss << "invalid daemon name: use ."; @@ -1808,7 +1808,7 @@ bool DaemonServer::_handle_command( int r = 0; string name; - if (cmd_getval(g_ceph_context, cmdctx->cmdmap, "key", name)) { + if (cmd_getval(cmdctx->cmdmap, "key", name)) { auto p = daemon->config.find(name); if (p != daemon->config.end() && !p->second.empty()) { @@ -2010,7 +2010,7 @@ bool DaemonServer::_handle_command( return true; } else if (prefix == "device ls-by-daemon") { string who; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "who", who); + cmd_getval(cmdctx->cmdmap, "who", who); if (auto [k, valid] = DaemonKey::parse(who); !valid) { ss << who << " is not a valid daemon name"; r = -EINVAL; @@ -2059,7 +2059,7 @@ bool DaemonServer::_handle_command( } } else if (prefix == "device ls-by-host") { string host; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "host", host); + cmd_getval(cmdctx->cmdmap, "host", host); set devids; daemon_state.list_devids_by_server(host, &devids); if (f) { @@ -2111,7 +2111,7 @@ bool DaemonServer::_handle_command( return true; } else if (prefix == "device info") { string devid; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "devid", devid); + cmd_getval(cmdctx->cmdmap, "devid", devid); int r = 0; ostringstream rs; if (!daemon_state.with_device(devid, @@ -2135,10 +2135,10 @@ bool DaemonServer::_handle_command( return true; } else if (prefix == "device set-life-expectancy") { string devid; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "devid", devid); + cmd_getval(cmdctx->cmdmap, "devid", devid); string from_str, to_str; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "from", from_str); - cmd_getval(g_ceph_context, cmdctx->cmdmap, "to", to_str); + cmd_getval(cmdctx->cmdmap, "from", from_str); + cmd_getval(cmdctx->cmdmap, "to", to_str); utime_t from, to; if (!from.parse(from_str)) { ss << "unable to parse datetime '" << from_str << "'"; @@ -2173,7 +2173,7 @@ bool DaemonServer::_handle_command( return true; } else if (prefix == "device rm-life-expectancy") { string devid; - cmd_getval(g_ceph_context, cmdctx->cmdmap, "devid", devid); + cmd_getval(cmdctx->cmdmap, "devid", devid); map meta; if (daemon_state.with_device_write(devid, [&meta] (DeviceState& dev) { dev.rm_life_expectancy(); diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index 3cb261b412a06..4e4bbccec85cf 100644 --- a/src/mon/AuthMonitor.cc +++ b/src/mon/AuthMonitor.cc @@ -772,7 +772,7 @@ bool AuthMonitor::preprocess_command(MonOpRequestRef op) } string prefix; - cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); if (prefix == "auth add" || prefix == "auth del" || prefix == "auth rm" || @@ -792,7 +792,7 @@ bool AuthMonitor::preprocess_command(MonOpRequestRef op) // entity might not be supplied, but if it is, it should be valid string entity_name; - cmd_getval(g_ceph_context, cmdmap, "entity", entity_name); + cmd_getval(cmdmap, "entity", entity_name); EntityName entity; if (!entity_name.empty() && !entity.from_str(entity_name)) { ss << "invalid entity_auth " << entity_name; @@ -801,7 +801,7 @@ bool AuthMonitor::preprocess_command(MonOpRequestRef op) } string format; - cmd_getval(g_ceph_context, cmdmap, "format", format, string("plain")); + cmd_getval(cmdmap, "format", format, string("plain")); boost::scoped_ptr f(Formatter::create(format)); if (prefix == "auth export") { @@ -1307,10 +1307,10 @@ bool AuthMonitor::prepare_command(MonOpRequestRef op) string entity_name; EntityName entity; - cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); string format; - cmd_getval(g_ceph_context, cmdmap, "format", format, string("plain")); + cmd_getval(cmdmap, "format", format, string("plain")); boost::scoped_ptr f(Formatter::create(format)); MonSession *session = op->get_session(); @@ -1319,14 +1319,14 @@ bool AuthMonitor::prepare_command(MonOpRequestRef op) return true; } - cmd_getval(g_ceph_context, cmdmap, "caps", caps_vec); + cmd_getval(cmdmap, "caps", caps_vec); if ((caps_vec.size() % 2) != 0) { ss << "bad capabilities request; odd number of arguments"; err = -EINVAL; goto done; } - cmd_getval(g_ceph_context, cmdmap, "entity", entity_name); + cmd_getval(cmdmap, "entity", entity_name); if (!entity_name.empty() && !entity.from_str(entity_name)) { ss << "bad entity name"; err = -EINVAL; @@ -1563,7 +1563,7 @@ bool AuthMonitor::prepare_command(MonOpRequestRef op) return true; } else if (prefix == "fs authorize") { string filesystem; - cmd_getval(g_ceph_context, cmdmap, "filesystem", filesystem); + cmd_getval(cmdmap, "filesystem", filesystem); string mds_cap_string, osd_cap_string; string osd_cap_wanted = "r"; diff --git a/src/mon/ConfigKeyService.cc b/src/mon/ConfigKeyService.cc index 566543657a26b..9a33473f8de8e 100644 --- a/src/mon/ConfigKeyService.cc +++ b/src/mon/ConfigKeyService.cc @@ -199,9 +199,9 @@ bool ConfigKeyService::service_dispatch(MonOpRequestRef op) return false; } - cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); string key; - cmd_getval(g_ceph_context, cmdmap, "key", key); + cmd_getval(cmdmap, "key", key); if (prefix == "config-key get") { ret = store_get(key, rdata); @@ -222,7 +222,7 @@ bool ConfigKeyService::service_dispatch(MonOpRequestRef op) bufferlist data; string val; - if (cmd_getval(g_ceph_context, cmdmap, "val", val)) { + if (cmd_getval(cmdmap, "val", val)) { // they specified a value in the command instead of a file data.append(val); } else if (cmd->get_data_len() > 0) { @@ -281,7 +281,7 @@ bool ConfigKeyService::service_dispatch(MonOpRequestRef op) } else if (prefix == "config-key dump") { string prefix; - cmd_getval(g_ceph_context, cmdmap, "key", prefix); + cmd_getval(cmdmap, "key", prefix); stringstream tmp_ss; store_dump(tmp_ss, prefix); rdata.append(tmp_ss); diff --git a/src/mon/ConfigMonitor.cc b/src/mon/ConfigMonitor.cc index b39d3c5f1830b..0a78bc6ad1cce 100644 --- a/src/mon/ConfigMonitor.cc +++ b/src/mon/ConfigMonitor.cc @@ -154,17 +154,17 @@ bool ConfigMonitor::preprocess_command(MonOpRequestRef op) return true; } string format; - cmd_getval(g_ceph_context, cmdmap, "format", format, string("plain")); + cmd_getval(cmdmap, "format", format, string("plain")); boost::scoped_ptr f(Formatter::create(format)); string prefix; - cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); bufferlist odata; if (prefix == "config help") { stringstream ss; string name; - cmd_getval(g_ceph_context, cmdmap, "key", name); + cmd_getval(cmdmap, "key", name); const Option *opt = g_conf().find_option(name); if (!opt) { opt = mon->mgrmon()->find_module_option(name); @@ -263,7 +263,7 @@ bool ConfigMonitor::preprocess_command(MonOpRequestRef op) } } else if (prefix == "config get") { string who, name; - cmd_getval(g_ceph_context, cmdmap, "who", who); + cmd_getval(cmdmap, "who", who); EntityName entity; if (!entity.from_str(who) && @@ -294,7 +294,7 @@ bool ConfigMonitor::preprocess_command(MonOpRequestRef op) device_class, &src); - if (cmd_getval(g_ceph_context, cmdmap, "key", name)) { + if (cmd_getval(cmdmap, "key", name)) { const Option *opt = g_conf().find_option(name); if (!opt) { opt = mon->mgrmon()->find_module_option(name); @@ -374,7 +374,7 @@ bool ConfigMonitor::preprocess_command(MonOpRequestRef op) } } else if (prefix == "config log") { int64_t num = 10; - cmd_getval(g_ceph_context, cmdmap, "num", num); + cmd_getval(cmdmap, "num", num); ostringstream ds; if (f) { f->open_array_section("changesets"); @@ -490,7 +490,7 @@ bool ConfigMonitor::prepare_command(MonOpRequestRef op) } string prefix; - cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); bufferlist odata; if (prefix == "config set" || @@ -498,10 +498,10 @@ bool ConfigMonitor::prepare_command(MonOpRequestRef op) string who; string name, value; bool force = false; - cmd_getval(g_ceph_context, cmdmap, "who", who); - cmd_getval(g_ceph_context, cmdmap, "name", name); - cmd_getval(g_ceph_context, cmdmap, "value", value); - cmd_getval(g_ceph_context, cmdmap, "force", force); + cmd_getval(cmdmap, "who", who); + cmd_getval(cmdmap, "name", name); + cmd_getval(cmdmap, "value", value); + cmd_getval(cmdmap, "force", force); if (prefix == "config set" && !force) { const Option *opt = g_conf().find_option(name); @@ -559,7 +559,7 @@ bool ConfigMonitor::prepare_command(MonOpRequestRef op) goto update; } else if (prefix == "config reset") { int64_t revert_to = -1; - cmd_getval(g_ceph_context, cmdmap, "num", revert_to); + cmd_getval(cmdmap, "num", revert_to); if (revert_to < 0 || revert_to > (int64_t)version) { err = -EINVAL; diff --git a/src/mon/FSCommands.cc b/src/mon/FSCommands.cc index 78c717eaf6e25..2c557ee95cfff 100644 --- a/src/mon/FSCommands.cc +++ b/src/mon/FSCommands.cc @@ -43,13 +43,13 @@ class FlagSetHandler : public FileSystemCommandHandler std::stringstream &ss) override { string flag_name; - cmd_getval(g_ceph_context, cmdmap, "flag_name", flag_name); + cmd_getval(cmdmap, "flag_name", flag_name); string flag_val; - cmd_getval(g_ceph_context, cmdmap, "val", flag_val); + cmd_getval(cmdmap, "val", flag_val); bool sure = false; - cmd_getval(g_ceph_context, cmdmap, "yes_i_really_mean_it", sure); + cmd_getval(cmdmap, "yes_i_really_mean_it", sure); if (flag_name == "enable_multiple") { bool flag_bool = false; @@ -93,7 +93,7 @@ class FailHandler : public FileSystemCommandHandler } std::string fs_name; - if (!cmd_getval(g_ceph_context, cmdmap, "fs_name", fs_name) || fs_name.empty()) { + if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) { ss << "Missing filesystem name"; return -EINVAL; } @@ -150,7 +150,7 @@ class FsNewHandler : public FileSystemCommandHandler ceph_assert(m_paxos->is_plugged()); string metadata_name; - cmd_getval(g_ceph_context, cmdmap, "metadata", metadata_name); + cmd_getval(cmdmap, "metadata", metadata_name); int64_t metadata = mon->osdmon()->osdmap.lookup_pg_pool_name(metadata_name); if (metadata < 0) { ss << "pool '" << metadata_name << "' does not exist"; @@ -158,7 +158,7 @@ class FsNewHandler : public FileSystemCommandHandler } string data_name; - cmd_getval(g_ceph_context, cmdmap, "data", data_name); + cmd_getval(cmdmap, "data", data_name); int64_t data = mon->osdmon()->osdmap.lookup_pg_pool_name(data_name); if (data < 0) { ss << "pool '" << data_name << "' does not exist"; @@ -170,7 +170,7 @@ class FsNewHandler : public FileSystemCommandHandler } string fs_name; - cmd_getval(g_ceph_context, cmdmap, "fs_name", fs_name); + cmd_getval(cmdmap, "fs_name", fs_name); if (fs_name.empty()) { // Ensure fs name is not empty so that we can implement // commmands that refer to FS by name in future. @@ -192,7 +192,7 @@ class FsNewHandler : public FileSystemCommandHandler } bool force = false; - cmd_getval(g_ceph_context,cmdmap, "force", force); + cmd_getval(cmdmap, "force", force); const pool_stat_t *stat = mon->mgrstatmon()->get_pool_stat(metadata); if (stat) { @@ -216,7 +216,7 @@ class FsNewHandler : public FileSystemCommandHandler const std::vector &data_pools = fs->mds_map.get_data_pools(); bool sure = false; - cmd_getval(g_ceph_context, cmdmap, + cmd_getval(cmdmap, "allow_dangerous_metadata_overlay", sure); if ((std::find(data_pools.begin(), data_pools.end(), data) != data_pools.end() @@ -304,7 +304,7 @@ public: std::stringstream &ss) override { std::string fs_name; - if (!cmd_getval(g_ceph_context, cmdmap, "fs_name", fs_name) || fs_name.empty()) { + if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) { ss << "Missing filesystem name"; return -EINVAL; } @@ -316,14 +316,14 @@ public: } string var; - if (!cmd_getval(g_ceph_context, cmdmap, "var", var) || var.empty()) { + if (!cmd_getval(cmdmap, "var", var) || var.empty()) { ss << "Invalid variable"; return -EINVAL; } string val; string interr; int64_t n = 0; - if (!cmd_getval(g_ceph_context, cmdmap, "val", val)) { + if (!cmd_getval(cmdmap, "val", val)) { return -EINVAL; } // we got a string. see if it contains an int. @@ -367,7 +367,7 @@ public: if (enable_inline) { bool confirm = false; - cmd_getval(g_ceph_context, cmdmap, "yes_i_really_really_mean_it", confirm); + cmd_getval(cmdmap, "yes_i_really_really_mean_it", confirm); if (!confirm) { ss << "Inline data support is deprecated and will be removed in a future release. " << "Add --yes-i-really-really-mean-it if you are certain you want this enabled."; @@ -460,7 +460,7 @@ public: } string confirm; - if (!cmd_getval(g_ceph_context, cmdmap, "confirm", confirm) || + if (!cmd_getval(cmdmap, "confirm", confirm) || confirm != "--yes-i-am-really-a-mds") { ss << "Warning! This command is for MDS only. Do not run it manually"; return -EPERM; @@ -648,10 +648,10 @@ class AddDataPoolHandler : public FileSystemCommandHandler ceph_assert(m_paxos->is_plugged()); string poolname; - cmd_getval(g_ceph_context, cmdmap, "pool", poolname); + cmd_getval(cmdmap, "pool", poolname); std::string fs_name; - if (!cmd_getval(g_ceph_context, cmdmap, "fs_name", fs_name) + if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) { ss << "Missing filesystem name"; return -EINVAL; @@ -725,7 +725,7 @@ class SetDefaultHandler : public FileSystemCommandHandler std::stringstream &ss) override { std::string fs_name; - cmd_getval(g_ceph_context, cmdmap, "fs_name", fs_name); + cmd_getval(cmdmap, "fs_name", fs_name); auto fs = fsmap.get_filesystem(fs_name); if (fs == nullptr) { ss << "filesystem '" << fs_name << "' does not exist"; @@ -762,7 +762,7 @@ class RemoveFilesystemHandler : public FileSystemCommandHandler // (redundant while there is only one FS, but command // syntax should apply to multi-FS future) string fs_name; - cmd_getval(g_ceph_context, cmdmap, "fs_name", fs_name); + cmd_getval(cmdmap, "fs_name", fs_name); auto fs = fsmap.get_filesystem(fs_name); if (fs == nullptr) { // Consider absence success to make deletes idempotent @@ -778,7 +778,7 @@ class RemoveFilesystemHandler : public FileSystemCommandHandler // Check for confirmation flag bool sure = false; - cmd_getval(g_ceph_context, cmdmap, "yes_i_really_mean_it", sure); + cmd_getval(cmdmap, "yes_i_really_mean_it", sure); if (!sure) { ss << "this is a DESTRUCTIVE operation and will make data in your filesystem permanently" \ " inaccessible. Add --yes-i-really-mean-it if you are sure you wish to continue."; @@ -826,7 +826,7 @@ class ResetFilesystemHandler : public FileSystemCommandHandler std::stringstream &ss) override { string fs_name; - cmd_getval(g_ceph_context, cmdmap, "fs_name", fs_name); + cmd_getval(cmdmap, "fs_name", fs_name); auto fs = fsmap.get_filesystem(fs_name); if (fs == nullptr) { ss << "filesystem '" << fs_name << "' does not exist"; @@ -843,7 +843,7 @@ class ResetFilesystemHandler : public FileSystemCommandHandler // Check for confirmation flag bool sure = false; - cmd_getval(g_ceph_context, cmdmap, "yes_i_really_mean_it", sure); + cmd_getval(cmdmap, "yes_i_really_mean_it", sure); if (!sure) { ss << "this is a potentially destructive operation, only for use by experts in disaster recovery. " "Add --yes-i-really-mean-it if you are sure you wish to continue."; @@ -871,10 +871,10 @@ class RemoveDataPoolHandler : public FileSystemCommandHandler std::stringstream &ss) override { string poolname; - cmd_getval(g_ceph_context, cmdmap, "pool", poolname); + cmd_getval(cmdmap, "pool", poolname); std::string fs_name; - if (!cmd_getval(g_ceph_context, cmdmap, "fs_name", fs_name) + if (!cmd_getval(cmdmap, "fs_name", fs_name) || fs_name.empty()) { ss << "Missing filesystem name"; return -EINVAL; diff --git a/src/mon/HealthMonitor.cc b/src/mon/HealthMonitor.cc index ca038a05565ce..3e3343796fb12 100644 --- a/src/mon/HealthMonitor.cc +++ b/src/mon/HealthMonitor.cc @@ -217,9 +217,9 @@ bool HealthMonitor::preprocess_command(MonOpRequestRef op) // more sanity checks try { string format; - cmd_getval(g_ceph_context, cmdmap, "format", format); + cmd_getval(cmdmap, "format", format); string prefix; - cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); } catch (const bad_cmd_get& e) { mon->reply_command(op, -EINVAL, e.what(), rdata, get_last_committed()); return true; @@ -248,27 +248,27 @@ bool HealthMonitor::prepare_command(MonOpRequestRef op) } string format; - cmd_getval(g_ceph_context, cmdmap, "format", format, string("plain")); + cmd_getval(cmdmap, "format", format, string("plain")); boost::scoped_ptr f(Formatter::create(format)); string prefix; - cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); int r = 0; if (prefix == "health mute") { string code; bool sticky = false; - if (!cmd_getval(g_ceph_context, cmdmap, "code", code) || + if (!cmd_getval(cmdmap, "code", code) || code == "") { r = -EINVAL; ss << "must specify an alert code to mute"; goto out; } - cmd_getval(g_ceph_context, cmdmap, "sticky", sticky); + cmd_getval(cmdmap, "sticky", sticky); string ttl_str; utime_t ttl; - if (cmd_getval(g_ceph_context, cmdmap, "ttl", ttl_str)) { + if (cmd_getval(cmdmap, "ttl", ttl_str)) { auto secs = parse_timespan(ttl_str); if (secs == 0s) { r = -EINVAL; @@ -300,7 +300,7 @@ bool HealthMonitor::prepare_command(MonOpRequestRef op) m.count = count; } else if (prefix == "health unmute") { string code; - if (cmd_getval(g_ceph_context, cmdmap, "code", code)) { + if (cmd_getval(cmdmap, "code", code)) { pending_mutes.erase(code); } else { pending_mutes.clear(); diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc index 7be118d0ed83f..3197ddb4b5406 100644 --- a/src/mon/LogMonitor.cc +++ b/src/mon/LogMonitor.cc @@ -411,22 +411,22 @@ bool LogMonitor::preprocess_command(MonOpRequestRef op) } string prefix; - cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); string format; - cmd_getval(g_ceph_context, cmdmap, "format", format, string("plain")); + cmd_getval(cmdmap, "format", format, string("plain")); boost::scoped_ptr f(Formatter::create(format)); if (prefix == "log last") { int64_t num = 20; - cmd_getval(g_ceph_context, cmdmap, "num", num); + cmd_getval(cmdmap, "num", num); if (f) { f->open_array_section("tail"); } std::string level_str; clog_type level; - if (cmd_getval(g_ceph_context, cmdmap, "level", level_str)) { + if (cmd_getval(cmdmap, "level", level_str)) { level = LogEntry::str_to_level(level_str); if (level == CLOG_UNKNOWN) { ss << "Invalid severity '" << level_str << "'"; @@ -438,7 +438,7 @@ bool LogMonitor::preprocess_command(MonOpRequestRef op) } std::string channel; - if (!cmd_getval(g_ceph_context, cmdmap, "channel", channel)) { + if (!cmd_getval(cmdmap, "channel", channel)) { channel = CLOG_CHANNEL_DEFAULT; } @@ -560,7 +560,7 @@ bool LogMonitor::prepare_command(MonOpRequestRef op) } string prefix; - cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); MonSession *session = op->get_session(); if (!session) { @@ -570,7 +570,7 @@ bool LogMonitor::prepare_command(MonOpRequestRef op) if (prefix == "log") { vector logtext; - cmd_getval(g_ceph_context, cmdmap, "logtext", logtext); + cmd_getval(cmdmap, "logtext", logtext); LogEntry le; le.rank = m->get_orig_source(); le.addrs.v.push_back(m->get_orig_source_addr()); diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 2c8b6e2975ef6..88f9638be4c84 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -56,22 +56,22 @@ static const string MDS_HEALTH_PREFIX("mds_health"); * Specialized implementation of cmd_getval to allow us to parse * out strongly-typedef'd types */ -template<> bool cmd_getval(CephContext *cct, const cmdmap_t& cmdmap, +template<> bool cmd_getval(const cmdmap_t& cmdmap, const std::string& k, mds_gid_t &val) { - return cmd_getval(cct, cmdmap, k, (int64_t&)val); + return cmd_getval(cmdmap, k, (int64_t&)val); } -template<> bool cmd_getval(CephContext *cct, const cmdmap_t& cmdmap, +template<> bool cmd_getval(const cmdmap_t& cmdmap, const std::string& k, mds_rank_t &val) { - return cmd_getval(cct, cmdmap, k, (int64_t&)val); + return cmd_getval(cmdmap, k, (int64_t&)val); } -template<> bool cmd_getval(CephContext *cct, const cmdmap_t& cmdmap, +template<> bool cmd_getval(const cmdmap_t& cmdmap, const std::string& k, MDSMap::DaemonState &val) { - return cmd_getval(cct, cmdmap, k, (int64_t&)val); + return cmd_getval(cmdmap, k, (int64_t&)val); } // my methods @@ -925,9 +925,9 @@ bool MDSMonitor::preprocess_command(MonOpRequestRef op) } string prefix; - cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); string format; - cmd_getval(g_ceph_context, cmdmap, "format", format, string("plain")); + cmd_getval(cmdmap, "format", format, string("plain")); std::unique_ptr f(Formatter::create(format)); MonSession *session = op->get_session(); @@ -948,7 +948,7 @@ bool MDSMonitor::preprocess_command(MonOpRequestRef op) r = 0; } else if (prefix == "mds ok-to-stop") { vector ids; - if (!cmd_getval(g_ceph_context, cmdmap, "ids", ids)) { + if (!cmd_getval(cmdmap, "ids", ids)) { r = -EINVAL; ss << "must specify mds id"; goto out; @@ -1003,7 +1003,7 @@ bool MDSMonitor::preprocess_command(MonOpRequestRef op) const FSMap *fsmapp = &fsmap; FSMap dummy; - if (cmd_getval(g_ceph_context, cmdmap, "epoch", epocharg)) { + if (cmd_getval(cmdmap, "epoch", epocharg)) { epoch = epocharg; bufferlist b; int err = get_version(epoch, b); @@ -1037,7 +1037,7 @@ bool MDSMonitor::preprocess_command(MonOpRequestRef op) f.reset(Formatter::create("json-pretty")); string who; - bool all = !cmd_getval(g_ceph_context, cmdmap, "who", who); + bool all = !cmd_getval(cmdmap, "who", who); dout(1) << "all = " << all << dendl; if (all) { r = 0; @@ -1083,7 +1083,7 @@ bool MDSMonitor::preprocess_command(MonOpRequestRef op) if (!f) f.reset(Formatter::create("json-pretty")); string field; - cmd_getval(g_ceph_context, cmdmap, "property", field); + cmd_getval(cmdmap, "property", field); count_metadata(field, f.get()); f->flush(ds); r = 0; @@ -1099,7 +1099,7 @@ bool MDSMonitor::preprocess_command(MonOpRequestRef op) r = 0; } else if (prefix == "fs get") { string fs_name; - cmd_getval(g_ceph_context, cmdmap, "fs_name", fs_name); + cmd_getval(cmdmap, "fs_name", fs_name); const auto &fs = fsmap.get_filesystem(fs_name); if (fs == nullptr) { ss << "filesystem '" << fs_name << "' not found"; @@ -1291,7 +1291,7 @@ bool MDSMonitor::prepare_command(MonOpRequestRef op) } string prefix; - cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); /* Refuse access if message not associated with a valid session */ MonSession *session = op->get_session(); @@ -1376,17 +1376,17 @@ int MDSMonitor::filesystem_command( op->mark_mdsmon_event(__func__); int r = 0; string whostr; - cmd_getval(g_ceph_context, cmdmap, "role", whostr); + cmd_getval(cmdmap, "role", whostr); if (prefix == "mds set_state") { mds_gid_t gid; - if (!cmd_getval(g_ceph_context, cmdmap, "gid", gid)) { + if (!cmd_getval(cmdmap, "gid", gid)) { ss << "error parsing 'gid' value '" << cmd_vartype_stringify(cmdmap.at("gid")) << "'"; return -EINVAL; } MDSMap::DaemonState state; - if (!cmd_getval(g_ceph_context, cmdmap, "state", state)) { + if (!cmd_getval(cmdmap, "state", state)) { ss << "error parsing 'state' string value '" << cmd_vartype_stringify(cmdmap.at("state")) << "'"; return -EINVAL; @@ -1401,7 +1401,7 @@ int MDSMonitor::filesystem_command( } } else if (prefix == "mds fail") { string who; - cmd_getval(g_ceph_context, cmdmap, "role_or_gid", who); + cmd_getval(cmdmap, "role_or_gid", who); MDSMap::mds_info_t failed_info; r = fail_mds(fsmap, ss, who, &failed_info); @@ -1417,7 +1417,7 @@ int MDSMonitor::filesystem_command( } } else if (prefix == "mds rm") { mds_gid_t gid; - if (!cmd_getval(g_ceph_context, cmdmap, "gid", gid)) { + if (!cmd_getval(cmdmap, "gid", gid)) { ss << "error parsing 'gid' value '" << cmd_vartype_stringify(cmdmap.at("gid")) << "'"; return -EINVAL; @@ -1440,7 +1440,7 @@ int MDSMonitor::filesystem_command( } } else if (prefix == "mds rmfailed") { bool confirm = false; - cmd_getval(g_ceph_context, cmdmap, "yes_i_really_mean_it", confirm); + cmd_getval(cmdmap, "yes_i_really_mean_it", confirm); if (!confirm) { ss << "WARNING: this can make your filesystem inaccessible! " "Add --yes-i-really-mean-it if you are sure you wish to continue."; @@ -1448,7 +1448,7 @@ int MDSMonitor::filesystem_command( } std::string role_str; - cmd_getval(g_ceph_context, cmdmap, "role", role_str); + cmd_getval(cmdmap, "role", role_str); mds_role_t role; int r = fsmap.parse_role(role_str, &role, ss); if (r < 0) { @@ -1467,7 +1467,7 @@ int MDSMonitor::filesystem_command( return 0; } else if (prefix == "mds compat rm_compat") { int64_t f; - if (!cmd_getval(g_ceph_context, cmdmap, "feature", f)) { + if (!cmd_getval(cmdmap, "feature", f)) { ss << "error parsing feature value '" << cmd_vartype_stringify(cmdmap.at("feature")) << "'"; return -EINVAL; @@ -1483,7 +1483,7 @@ int MDSMonitor::filesystem_command( r = 0; } else if (prefix == "mds compat rm_incompat") { int64_t f; - if (!cmd_getval(g_ceph_context, cmdmap, "feature", f)) { + if (!cmd_getval(cmdmap, "feature", f)) { ss << "error parsing feature value '" << cmd_vartype_stringify(cmdmap.at("feature")) << "'"; return -EINVAL; @@ -1499,7 +1499,7 @@ int MDSMonitor::filesystem_command( r = 0; } else if (prefix == "mds repaired") { std::string role_str; - cmd_getval(g_ceph_context, cmdmap, "role", role_str); + cmd_getval(cmdmap, "role", role_str); mds_role_t role; r = fsmap.parse_role(role_str, &role, ss); if (r < 0) { @@ -1516,7 +1516,7 @@ int MDSMonitor::filesystem_command( r = 0; } else if (prefix == "mds freeze") { std::string who; - cmd_getval(g_ceph_context, cmdmap, "role_or_gid", who); + cmd_getval(cmdmap, "role_or_gid", who); mds_gid_t gid = gid_from_arg(fsmap, who, ss); if (gid == MDS_GID_NONE) { return -EINVAL; @@ -1525,7 +1525,7 @@ int MDSMonitor::filesystem_command( bool freeze = false; { std::string str; - cmd_getval(g_ceph_context, cmdmap, "val", str); + cmd_getval(cmdmap, "val", str); if ((r = parse_bool(str, &freeze, ss)) != 0) { return r; } diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc index e30a47338da00..ec7108317b86c 100644 --- a/src/mon/MgrMonitor.cc +++ b/src/mon/MgrMonitor.cc @@ -898,17 +898,17 @@ bool MgrMonitor::preprocess_command(MonOpRequestRef op) } string format; - cmd_getval(g_ceph_context, cmdmap, "format", format); + cmd_getval(cmdmap, "format", format); boost::scoped_ptr f(Formatter::create(format, "json-pretty", "json-pretty")); string prefix; - cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); int r = 0; if (prefix == "mgr dump") { int64_t epoch = 0; - cmd_getval(g_ceph_context, cmdmap, "epoch", epoch, (int64_t)map.get_epoch()); + cmd_getval(cmdmap, "epoch", epoch, (int64_t)map.get_epoch()); if (epoch == (int64_t)map.get_epoch()) { f->dump_object("mgrmap", map); } else { @@ -964,14 +964,14 @@ bool MgrMonitor::preprocess_command(MonOpRequestRef op) f->flush(rdata); } else if (prefix == "mgr metadata") { string name; - cmd_getval(g_ceph_context, cmdmap, "who", name); + cmd_getval(cmdmap, "who", name); if (name.size() > 0 && !map.have_name(name)) { ss << "mgr." << name << " does not exist"; r = -ENOENT; goto reply; } string format; - cmd_getval(g_ceph_context, cmdmap, "format", format); + cmd_getval(cmdmap, "format", format); boost::scoped_ptr f(Formatter::create(format, "json-pretty", "json-pretty")); if (name.size()) { f->open_object_section("mgr_metadata"); @@ -1006,7 +1006,7 @@ bool MgrMonitor::preprocess_command(MonOpRequestRef op) r = 0; } else if (prefix == "mgr count-metadata") { string field; - cmd_getval(g_ceph_context, cmdmap, "property", field); + cmd_getval(cmdmap, "property", field); count_metadata(field, f.get()); f->flush(rdata); r = 0; @@ -1042,17 +1042,17 @@ bool MgrMonitor::prepare_command(MonOpRequestRef op) } string format; - cmd_getval(g_ceph_context, cmdmap, "format", format, string("plain")); + cmd_getval(cmdmap, "format", format, string("plain")); boost::scoped_ptr f(Formatter::create(format)); string prefix; - cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); int r = 0; if (prefix == "mgr fail") { string who; - cmd_getval(g_ceph_context, cmdmap, "who", who); + cmd_getval(cmdmap, "who", who); std::string err; uint64_t gid = strict_strtol(who.c_str(), 10, &err); @@ -1102,7 +1102,7 @@ bool MgrMonitor::prepare_command(MonOpRequestRef op) } } else if (prefix == "mgr module enable") { string module; - cmd_getval(g_ceph_context, cmdmap, "module", module); + cmd_getval(cmdmap, "module", module); if (module.empty()) { r = -EINVAL; goto out; @@ -1112,7 +1112,7 @@ bool MgrMonitor::prepare_command(MonOpRequestRef op) goto out; } string force; - cmd_getval(g_ceph_context, cmdmap, "force", force); + cmd_getval(cmdmap, "force", force); if (!pending_map.all_support_module(module) && force != "--force") { ss << "all mgr daemons do not support module '" << module << "', pass " @@ -1138,7 +1138,7 @@ bool MgrMonitor::prepare_command(MonOpRequestRef op) pending_map.modules.insert(module); } else if (prefix == "mgr module disable") { string module; - cmd_getval(g_ceph_context, cmdmap, "module", module); + cmd_getval(cmdmap, "module", module); if (module.empty()) { r = -EINVAL; goto out; diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 807dcb27114a5..e7afe45d68d3b 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -314,7 +314,7 @@ int Monitor::do_admin_command( _quorum_status(f, out); } else if (command == "sync_force") { string validate; - if ((!cmd_getval(g_ceph_context, cmdmap, "validate", validate)) || + if ((!cmd_getval(cmdmap, "validate", validate)) || (validate != "--yes-i-really-mean-it")) { err << "are you SURE? this will mean the monitor store will be erased " "the next time the monitor is restarted. pass " @@ -360,7 +360,7 @@ int Monitor::do_admin_command( } } else if (command == "quorum") { string quorumcmd; - cmd_getval(g_ceph_context, cmdmap, "quorumcmd", quorumcmd); + cmd_getval(cmdmap, "quorumcmd", quorumcmd); if (quorumcmd == "exit") { start_election(); elector.stop_participating(); @@ -374,7 +374,7 @@ int Monitor::do_admin_command( } } else if (command == "smart") { string want_devid; - cmd_getval(cct, cmdmap, "devid", want_devid); + cmd_getval(cmdmap, "devid", want_devid); string devname = store->get_devname(); set devnames; @@ -406,7 +406,7 @@ int Monitor::do_admin_command( goto abort; } string cmd; - if (!cmd_getval(cct, cmdmap, "heapcmd", cmd)) { + if (!cmd_getval(cmdmap, "heapcmd", cmd)) { err << "unable to get value for command \"" << cmd << "\""; r = -EINVAL; goto abort; @@ -414,7 +414,7 @@ int Monitor::do_admin_command( std::vector cmd_vec; get_str_vec(cmd, cmd_vec); string val; - if (cmd_getval(cct, cmdmap, "value", val)) { + if (cmd_getval(cmdmap, "value", val)) { cmd_vec.push_back(val); } ceph_heap_profiler_handle_command(cmd_vec, out); @@ -1218,7 +1218,7 @@ bool Monitor::_add_bootstrap_peer_hint(std::string_view cmd, entity_addrvec_t addrs; string addrstr; - if (cmd_getval(g_ceph_context, cmdmap, "addr", addrstr)) { + if (cmd_getval(cmdmap, "addr", addrstr)) { dout(10) << "_add_bootstrap_peer_hint '" << cmd << "' addr '" << addrstr << "'" << dendl; @@ -1244,7 +1244,7 @@ bool Monitor::_add_bootstrap_peer_hint(std::string_view cmd, addrs.v[0].set_type(entity_addr_t::TYPE_MSGR2); } } - } else if (cmd_getval(g_ceph_context, cmdmap, "addrv", addrstr)) { + } else if (cmd_getval(cmdmap, "addrv", addrstr)) { dout(10) << "_add_bootstrap_peer_hintv '" << cmd << "' addrv '" << addrstr << "'" << dendl; const char *end = 0; @@ -3009,7 +3009,7 @@ void Monitor::_generate_command_map(cmdmap_t& cmdmap, continue; if (p->first == "caps") { vector cv; - if (cmd_getval(g_ceph_context, cmdmap, "caps", cv) && + if (cmd_getval(cmdmap, "caps", cv) && cv.size() % 2 == 0) { for (unsigned i = 0; i < cv.size(); i += 2) { string k = string("caps_") + cv[i]; @@ -3118,7 +3118,7 @@ void Monitor::handle_tell_command(MonOpRequestRef op) map param_str_map; _generate_command_map(cmdmap, param_str_map); string prefix; - if (!cmd_getval(g_ceph_context, cmdmap, "prefix", prefix)) { + if (!cmd_getval(cmdmap, "prefix", prefix)) { return reply_tell_command(op, -EINVAL, "no prefix"); } if (auto cmd = _get_moncommand(prefix, @@ -3187,7 +3187,7 @@ void Monitor::handle_command(MonOpRequestRef op) // check return value. If no prefix parameter provided, // return value will be false, then return error info. - if (!cmd_getval(g_ceph_context, cmdmap, "prefix", prefix)) { + if (!cmd_getval(cmdmap, "prefix", prefix)) { reply_command(op, -EINVAL, "command prefix not found", 0); return; } @@ -3237,7 +3237,7 @@ void Monitor::handle_command(MonOpRequestRef op) dout(0) << "handle_command " << *m << dendl; string format; - cmd_getval(g_ceph_context, cmdmap, "format", format, string("plain")); + cmd_getval(cmdmap, "format", format, string("plain")); boost::scoped_ptr f(Formatter::create(format)); get_str_vec(prefix, fullcmd); @@ -3486,7 +3486,7 @@ void Monitor::handle_command(MonOpRequestRef op) prefix == "health" || prefix == "df") { string detail; - cmd_getval(g_ceph_context, cmdmap, "detail", detail); + cmd_getval(cmdmap, "detail", detail); if (prefix == "status") { // get_cluster_status handles f == NULL @@ -3540,7 +3540,7 @@ void Monitor::handle_command(MonOpRequestRef op) f->dump_stream("timestamp") << ceph_clock_now(); vector tagsvec; - cmd_getval(g_ceph_context, cmdmap, "tags", tagsvec); + cmd_getval(cmdmap, "tags", tagsvec); string tagstr = str_join(tagsvec, " "); if (!tagstr.empty()) tagstr = tagstr.substr(0, tagstr.find_last_of(' ')); @@ -3565,7 +3565,7 @@ void Monitor::handle_command(MonOpRequestRef op) r = 0; } else if (prefix == "osd last-stat-seq") { int64_t osd; - cmd_getval(g_ceph_context, cmdmap, "id", osd); + cmd_getval(cmdmap, "id", osd); uint64_t seq = mgrstatmon()->get_last_osd_stat_seq(osd); if (f) { f->dump_unsigned("seq", seq); @@ -3578,7 +3578,7 @@ void Monitor::handle_command(MonOpRequestRef op) r = 0; } else if (prefix == "node ls") { string node_type("all"); - cmd_getval(g_ceph_context, cmdmap, "type", node_type); + cmd_getval(cmdmap, "type", node_type); if (!f) f.reset(Formatter::create("json-pretty")); if (node_type == "all") { @@ -3624,7 +3624,7 @@ void Monitor::handle_command(MonOpRequestRef op) f.reset(Formatter::create("json-pretty")); string name; - bool all = !cmd_getval(g_ceph_context, cmdmap, "id", name); + bool all = !cmd_getval(cmdmap, "id", name); if (!all) { // Dump a single mon's metadata int mon = monmap->get_rank(name); @@ -3675,7 +3675,7 @@ void Monitor::handle_command(MonOpRequestRef op) if (!f) f.reset(Formatter::create("json-pretty")); string field; - cmd_getval(g_ceph_context, cmdmap, "property", field); + cmd_getval(cmdmap, "property", field); count_metadata(field, f.get()); f->flush(ds); rdata.append(ds); @@ -3694,7 +3694,7 @@ void Monitor::handle_command(MonOpRequestRef op) r = 0; } else if (prefix == "mon ok-to-stop") { vector ids; - if (!cmd_getval(g_ceph_context, cmdmap, "ids", ids)) { + if (!cmd_getval(cmdmap, "ids", ids)) { r = -EINVAL; goto out; } @@ -3726,7 +3726,7 @@ void Monitor::handle_command(MonOpRequestRef op) r = 0; } else if (prefix == "mon ok-to-rm") { string id; - if (!cmd_getval(g_ceph_context, cmdmap, "id", id)) { + if (!cmd_getval(cmdmap, "id", id)) { r = -EINVAL; rs = "must specify a monitor id"; goto out; diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc index ee6d077c1f500..55488ff315fdc 100644 --- a/src/mon/MonmapMonitor.cc +++ b/src/mon/MonmapMonitor.cc @@ -264,7 +264,7 @@ bool MonmapMonitor::preprocess_command(MonOpRequestRef op) } string prefix; - cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); MonSession *session = op->get_session(); if (!session) { @@ -273,7 +273,7 @@ bool MonmapMonitor::preprocess_command(MonOpRequestRef op) } string format; - cmd_getval(g_ceph_context, cmdmap, "format", format, string("plain")); + cmd_getval(cmdmap, "format", format, string("plain")); boost::scoped_ptr f(Formatter::create(format)); if (prefix == "mon stat") { @@ -290,7 +290,7 @@ bool MonmapMonitor::preprocess_command(MonOpRequestRef op) epoch_t epoch; int64_t epochnum; - cmd_getval(g_ceph_context, cmdmap, "epoch", epochnum, (int64_t)0); + cmd_getval(cmdmap, "epoch", epochnum, (int64_t)0); epoch = epochnum; MonMap *p = mon->monmap; @@ -343,7 +343,7 @@ bool MonmapMonitor::preprocess_command(MonOpRequestRef op) bool list_with_value = false; string with_value; - if (cmd_getval(g_ceph_context, cmdmap, "with_value", with_value) && + if (cmd_getval(cmdmap, "with_value", with_value) && with_value == "--with-value") { list_with_value = true; } @@ -462,7 +462,7 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op) } string prefix; - cmd_getval(g_ceph_context, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); MonSession *session = op->get_session(); if (!session) { @@ -523,9 +523,9 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op) bool propose = false; if (prefix == "mon add") { string name; - cmd_getval(g_ceph_context, cmdmap, "name", name); + cmd_getval(cmdmap, "name", name); string addrstr; - cmd_getval(g_ceph_context, cmdmap, "addr", addrstr); + cmd_getval(cmdmap, "addr", addrstr); entity_addr_t addr; bufferlist rdata; @@ -617,7 +617,7 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op) } else if (prefix == "mon remove" || prefix == "mon rm") { string name; - cmd_getval(g_ceph_context, cmdmap, "name", name); + cmd_getval(cmdmap, "name", name); if (!monmap.contains(name)) { err = 0; ss << "mon." << name << " does not exist or has already been removed"; @@ -683,7 +683,7 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op) * 'mon flag set/unset'. */ string feature_name; - if (!cmd_getval(g_ceph_context, cmdmap, "feature_name", feature_name)) { + if (!cmd_getval(cmdmap, "feature_name", feature_name)) { ss << "missing required feature name"; err = -EINVAL; goto reply; @@ -698,7 +698,7 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op) } bool sure = false; - cmd_getval(g_ceph_context, cmdmap, "yes_i_really_mean_it", sure); + cmd_getval(cmdmap, "yes_i_really_mean_it", sure); if (!sure) { ss << "please specify '--yes-i-really-mean-it' if you " << "really, **really** want to set feature '" @@ -736,8 +736,8 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op) } else if (prefix == "mon set-rank") { string name; int64_t rank; - if (!cmd_getval(g_ceph_context, cmdmap, "name", name) || - !cmd_getval(g_ceph_context, cmdmap, "rank", rank)) { + if (!cmd_getval(cmdmap, "name", name) || + !cmd_getval(cmdmap, "rank", rank)) { err = -EINVAL; goto reply; } @@ -754,8 +754,8 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op) } else if (prefix == "mon set-addrs") { string name; string addrs; - if (!cmd_getval(g_ceph_context, cmdmap, "name", name) || - !cmd_getval(g_ceph_context, cmdmap, "addrs", addrs)) { + if (!cmd_getval(cmdmap, "name", name) || + !cmd_getval(cmdmap, "addrs", addrs)) { err = -EINVAL; goto reply; } @@ -785,8 +785,8 @@ bool MonmapMonitor::prepare_command(MonOpRequestRef op) } else if (prefix == "mon set-weight") { string name; int64_t weight; - if (!cmd_getval(g_ceph_context, cmdmap, "name", name) || - !cmd_getval(g_ceph_context, cmdmap, "weight", weight)) { + if (!cmd_getval(cmdmap, "name", name) || + !cmd_getval(cmdmap, "weight", weight)) { err = -EINVAL; goto reply; } diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index c83d417ac5c28..25c8fa2bc5938 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -5252,10 +5252,10 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } string prefix; - cmd_getval(cct, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); string format; - cmd_getval(cct, cmdmap, "format", format, string("plain")); + cmd_getval(cmdmap, "format", format, string("plain")); boost::scoped_ptr f(Formatter::create(format)); if (prefix == "osd stat") { @@ -5281,7 +5281,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) epoch_t epoch = 0; int64_t epochnum; - cmd_getval(cct, cmdmap, "epoch", epochnum, (int64_t)osdmap.get_epoch()); + cmd_getval(cmdmap, "epoch", epochnum, (int64_t)osdmap.get_epoch()); epoch = epochnum; bufferlist osdmap_bl; @@ -5346,7 +5346,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } else if (prefix == "osd info") { int64_t osd_id; bool do_single_osd = true; - if (!cmd_getval(cct, cmdmap, "id", osd_id)) { + if (!cmd_getval(cmdmap, "id", osd_id)) { do_single_osd = false; } @@ -5374,7 +5374,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } else if (prefix == "osd tree" || prefix == "osd tree-from") { string bucket; if (prefix == "osd tree-from") { - cmd_getval(cct, cmdmap, "bucket", bucket); + cmd_getval(cmdmap, "bucket", bucket); if (!osdmap.crush->name_exists(bucket)) { ss << "bucket '" << bucket << "' does not exist"; r = -ENOENT; @@ -5389,7 +5389,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } vector states; - cmd_getval(cct, cmdmap, "states", states); + cmd_getval(cmdmap, "states", states); unsigned filter = 0; for (auto& s : states) { if (s == "up") { @@ -5441,7 +5441,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) ss << p->get_crush_version(); } else if (prefix == "osd ls-tree") { string bucket_name; - cmd_getval(cct, cmdmap, "name", bucket_name); + cmd_getval(cmdmap, "name", bucket_name); set osds; r = p->get_osds_by_bucket_name(bucket_name, &osds); if (r == -ENOENT) { @@ -5497,7 +5497,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) goto reply; } else if (prefix == "osd find") { int64_t osd; - if (!cmd_getval(cct, cmdmap, "id", osd)) { + if (!cmd_getval(cmdmap, "id", osd)) { ss << "unable to parse osd id value '" << cmd_vartype_stringify(cmdmap["id"]) << "'"; r = -EINVAL; @@ -5509,7 +5509,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) goto reply; } string format; - cmd_getval(cct, cmdmap, "format", format); + cmd_getval(cmdmap, "format", format); boost::scoped_ptr f(Formatter::create(format, "json-pretty", "json-pretty")); f->open_object_section("osd_location"); f->dump_int("osd", osd); @@ -5542,7 +5542,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } else if (prefix == "osd metadata") { int64_t osd = -1; if (cmd_vartype_stringify(cmdmap["id"]).size() && - !cmd_getval(cct, cmdmap, "id", osd)) { + !cmd_getval(cmdmap, "id", osd)) { ss << "unable to parse osd id value '" << cmd_vartype_stringify(cmdmap["id"]) << "'"; r = -EINVAL; @@ -5554,7 +5554,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) goto reply; } string format; - cmd_getval(cct, cmdmap, "format", format); + cmd_getval(cmdmap, "format", format); boost::scoped_ptr f(Formatter::create(format, "json-pretty", "json-pretty")); if (osd >= 0) { f->open_object_section("osd_metadata"); @@ -5595,7 +5595,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) if (!f) f.reset(Formatter::create("json-pretty")); string field; - cmd_getval(cct, cmdmap, "property", field); + cmd_getval(cmdmap, "property", field); count_metadata(field, f.get()); f->flush(rdata); r = 0; @@ -5688,9 +5688,9 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } } else if (prefix == "osd map") { string poolstr, objstr, namespacestr; - cmd_getval(cct, cmdmap, "pool", poolstr); - cmd_getval(cct, cmdmap, "object", objstr); - cmd_getval(cct, cmdmap, "nspace", namespacestr); + cmd_getval(cmdmap, "pool", poolstr); + cmd_getval(cmdmap, "object", objstr); + cmd_getval(cmdmap, "nspace", namespacestr); int64_t pool = osdmap.lookup_pg_pool_name(poolstr.c_str()); if (pool < 0) { @@ -5744,7 +5744,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } else if (prefix == "pg map") { pg_t pgid; string pgidstr; - cmd_getval(cct, cmdmap, "pgid", pgidstr); + cmd_getval(cmdmap, "pgid", pgidstr); if (!pgid.parse(pgidstr.c_str())) { ss << "invalid pgid '" << pgidstr << "'"; r = -EINVAL; @@ -5835,7 +5835,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } else if (prefix == "osd pool ls") { string detail; - cmd_getval(cct, cmdmap, "detail", detail); + cmd_getval(cmdmap, "detail", detail); if (!f && detail == "detail") { ostringstream ss; osdmap.print_pools(ss); @@ -5868,7 +5868,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } else if (prefix == "osd crush get-tunable") { string tunable; - cmd_getval(cct, cmdmap, "tunable", tunable); + cmd_getval(cmdmap, "tunable", tunable); ostringstream rss; if (f) f->open_object_section("tunable"); @@ -5891,7 +5891,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } else if (prefix == "osd pool get") { string poolstr; - cmd_getval(cct, cmdmap, "pool", poolstr); + cmd_getval(cmdmap, "pool", poolstr); int64_t pool = osdmap.lookup_pg_pool_name(poolstr.c_str()); if (pool < 0) { ss << "unrecognized pool '" << poolstr << "'"; @@ -5901,7 +5901,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) const pg_pool_t *p = osdmap.get_pg_pool(pool); string var; - cmd_getval(cct, cmdmap, "var", var); + cmd_getval(cmdmap, "var", var); typedef std::map choices_map_t; const choices_map_t ALL_CHOICES = { @@ -6348,7 +6348,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) r = 0; } else if (prefix == "osd pool get-quota") { string pool_name; - cmd_getval(cct, cmdmap, "pool", pool_name); + cmd_getval(cmdmap, "pool", pool_name); int64_t poolid = osdmap.lookup_pg_pool_name(pool_name); if (poolid < 0) { @@ -6406,7 +6406,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } } else if (prefix == "osd crush rule ls-by-class") { string class_name; - cmd_getval(cct, cmdmap, "class", class_name); + cmd_getval(cmdmap, "class", class_name); if (class_name.empty()) { ss << "no class specified"; r = -EINVAL; @@ -6434,9 +6434,9 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } } else if (prefix == "osd crush rule dump") { string name; - cmd_getval(cct, cmdmap, "name", name); + cmd_getval(cmdmap, "name", name); string format; - cmd_getval(cct, cmdmap, "format", format); + cmd_getval(cmdmap, "format", format); boost::scoped_ptr f(Formatter::create(format, "json-pretty", "json-pretty")); if (name == "") { f->open_array_section("rules"); @@ -6457,7 +6457,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) rdata.append(rs.str()); } else if (prefix == "osd crush dump") { string format; - cmd_getval(cct, cmdmap, "format", format); + cmd_getval(cmdmap, "format", format); boost::scoped_ptr f(Formatter::create(format, "json-pretty", "json-pretty")); f->open_object_section("crush_map"); osdmap.crush->dump(f.get()); @@ -6468,7 +6468,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) rdata.append(rs.str()); } else if (prefix == "osd crush show-tunables") { string format; - cmd_getval(cct, cmdmap, "format", format); + cmd_getval(cmdmap, "format", format); boost::scoped_ptr f(Formatter::create(format, "json-pretty", "json-pretty")); f->open_object_section("crush_map_tunables"); osdmap.crush->dump_tunables(f.get()); @@ -6479,7 +6479,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) rdata.append(rs.str()); } else if (prefix == "osd crush tree") { string shadow; - cmd_getval(cct, cmdmap, "shadow", shadow); + cmd_getval(cmdmap, "shadow", shadow); bool show_shadow = shadow == "--show-shadow"; boost::scoped_ptr f(Formatter::create(format)); if (f) { @@ -6500,7 +6500,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } } else if (prefix == "osd crush ls") { string name; - if (!cmd_getval(cct, cmdmap, "node", name)) { + if (!cmd_getval(cmdmap, "node", name)) { ss << "no node specified"; r = -EINVAL; goto reply; @@ -6544,7 +6544,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) f->flush(rdata); } else if (prefix == "osd crush class ls-osd") { string name; - cmd_getval(cct, cmdmap, "class", name); + cmd_getval(cmdmap, "class", name); set osds; osdmap.crush->get_devices_by_class(name, &osds); if (f) { @@ -6565,7 +6565,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) } } else if (prefix == "osd crush get-device-class") { vector idvec; - cmd_getval(cct, cmdmap, "ids", idvec); + cmd_getval(cmdmap, "ids", idvec); map class_by_osd; for (auto& id : idvec) { ostringstream ts; @@ -6657,7 +6657,7 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) f->flush(rdata); } else if (prefix == "osd erasure-code-profile get") { string name; - cmd_getval(cct, cmdmap, "name", name); + cmd_getval(cmdmap, "name", name); if (!osdmap.has_erasure_code_profile(name)) { ss << "unknown erasure code profile '" << name << "'"; r = -ENOENT; @@ -6685,11 +6685,11 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) boost::scoped_ptr f(Formatter::create(format, "json-pretty", "json-pretty")); string pool_name; - cmd_getval(cct, cmdmap, "pool", pool_name); + cmd_getval(cmdmap, "pool", pool_name); string app; - cmd_getval(cct, cmdmap, "app", app); + cmd_getval(cmdmap, "app", app); string key; - cmd_getval(cct, cmdmap, "key", key); + cmd_getval(cmdmap, "key", key); if (pool_name.empty()) { // all @@ -7847,14 +7847,14 @@ int OSDMonitor::prepare_command_pool_set(const cmdmap_t& cmdmap, stringstream& ss) { string poolstr; - cmd_getval(cct, cmdmap, "pool", poolstr); + cmd_getval(cmdmap, "pool", poolstr); int64_t pool = osdmap.lookup_pg_pool_name(poolstr.c_str()); if (pool < 0) { ss << "unrecognized pool '" << poolstr << "'"; return -ENOENT; } string var; - cmd_getval(cct, cmdmap, "var", var); + cmd_getval(cmdmap, "var", var); pg_pool_t p = *osdmap.get_pg_pool(pool); if (pending_inc.new_pools.count(pool)) @@ -7870,7 +7870,7 @@ int OSDMonitor::prepare_command_pool_set(const cmdmap_t& cmdmap, int64_t n = 0; double f = 0; int64_t uf = 0; // micro-f - cmd_getval(cct, cmdmap, "val", val); + cmd_getval(cmdmap, "val", val); auto si_options = { "target_max_objects" @@ -8038,7 +8038,7 @@ int OSDMonitor::prepare_command_pool_set(const cmdmap_t& cmdmap, return r; } bool force = false; - cmd_getval(cct,cmdmap, "yes_i_really_mean_it", force); + cmd_getval(cmdmap, "yes_i_really_mean_it", force); if (p.cache_mode != pg_pool_t::CACHEMODE_NONE && !force) { ss << "splits in cache pools must be followed by scrubs and leave sufficient free space to avoid overfilling. use --yes-i-really-mean-it to force."; return -EPERM; @@ -8156,7 +8156,7 @@ int OSDMonitor::prepare_command_pool_set(const cmdmap_t& cmdmap, } else if (var == "hashpspool") { uint64_t flag = pg_pool_t::get_flag_by_name(var); bool force = false; - cmd_getval(cct, cmdmap, "yes_i_really_mean_it", force); + cmd_getval(cmdmap, "yes_i_really_mean_it", force); if (!force) { ss << "are you SURE? this will remap all placement groups in this pool," @@ -8519,7 +8519,7 @@ int OSDMonitor::_command_pool_application(const string &prefix, bool preparing) { string pool_name; - cmd_getval(cct, cmdmap, "pool", pool_name); + cmd_getval(cmdmap, "pool", pool_name); int64_t pool = osdmap.lookup_pg_pool_name(pool_name.c_str()); if (pool < 0) { ss << "unrecognized pool '" << pool_name << "'"; @@ -8534,18 +8534,18 @@ int OSDMonitor::_command_pool_application(const string &prefix, } string app; - cmd_getval(cct, cmdmap, "app", app); + cmd_getval(cmdmap, "app", app); bool app_exists = (p.application_metadata.count(app) > 0); string key; - cmd_getval(cct, cmdmap, "key", key); + cmd_getval(cmdmap, "key", key); if (key == "all") { ss << "key cannot be 'all'"; return -EINVAL; } string value; - cmd_getval(cct, cmdmap, "value", value); + cmd_getval(cmdmap, "value", value); if (value == "all") { ss << "value cannot be 'all'"; return -EINVAL; @@ -8563,7 +8563,7 @@ int OSDMonitor::_command_pool_application(const string &prefix, } bool force = false; - cmd_getval(cct, cmdmap, "yes_i_really_mean_it", force); + cmd_getval(cmdmap, "yes_i_really_mean_it", force); if (!app_exists && !p.application_metadata.empty() && !force) { ss << "Are you SURE? Pool '" << pool_name << "' already has an enabled " @@ -8590,7 +8590,7 @@ int OSDMonitor::_command_pool_application(const string &prefix, } else if (boost::algorithm::ends_with(prefix, "disable")) { bool force = false; - cmd_getval(cct, cmdmap, "yes_i_really_mean_it", force); + cmd_getval(cmdmap, "yes_i_really_mean_it", force); if (!force) { ss << "Are you SURE? Disabling an application within a pool might result " @@ -8621,7 +8621,7 @@ int OSDMonitor::_command_pool_application(const string &prefix, } string key; - cmd_getval(cct, cmdmap, "key", key); + cmd_getval(cmdmap, "key", key); if (key.empty()) { ss << "key must be provided"; @@ -8643,7 +8643,7 @@ int OSDMonitor::_command_pool_application(const string &prefix, } string value; - cmd_getval(cct, cmdmap, "value", value); + cmd_getval(cmdmap, "value", value); if (value.length() > MAX_POOL_APPLICATION_LENGTH) { ss << "value '" << value << "' too long; max length " << MAX_POOL_APPLICATION_LENGTH; @@ -8661,7 +8661,7 @@ int OSDMonitor::_command_pool_application(const string &prefix, } string key; - cmd_getval(cct, cmdmap, "key", key); + cmd_getval(cmdmap, "key", key); auto it = p.application_metadata[app].find(key); if (it == p.application_metadata[app].end()) { ss << "application '" << app << "' on pool '" << pool_name @@ -8985,7 +8985,7 @@ int OSDMonitor::prepare_command_osd_new( * If `id` is specified, and the osd has been previously marked * as destroyed, then the `id` will be reused. */ - if (!cmd_getval(cct, cmdmap, "uuid", uuidstr)) { + if (!cmd_getval(cmdmap, "uuid", uuidstr)) { ss << "requires the OSD's UUID to be specified."; return -EINVAL; } else if (!uuid.parse(uuidstr.c_str())) { @@ -8993,7 +8993,7 @@ int OSDMonitor::prepare_command_osd_new( return -EINVAL; } - if (cmd_getval(cct, cmdmap, "id", id) && + if (cmd_getval(cmdmap, "id", id) && (id < 0)) { ss << "invalid OSD id; must be greater or equal than zero."; return -EINVAL; @@ -9243,7 +9243,7 @@ static int parse_reweights(CephContext *cct, map* weights) { string weights_str; - if (!cmd_getval(cct, cmdmap, "weights", weights_str)) { + if (!cmd_getval(cmdmap, "weights", weights_str)) { return -EINVAL; } std::replace(begin(weights_str), end(weights_str), '\'', '"'); @@ -9426,11 +9426,11 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, int err = 0; string format; - cmd_getval(cct, cmdmap, "format", format, string("plain")); + cmd_getval(cmdmap, "format", format, string("plain")); boost::scoped_ptr f(Formatter::create(format)); string prefix; - cmd_getval(cct, cmdmap, "prefix", prefix); + cmd_getval(cmdmap, "prefix", prefix); int64_t osdid; string osd_name; @@ -9438,7 +9438,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, if (prefix != "osd pg-temp" && prefix != "osd pg-upmap" && prefix != "osd pg-upmap-items") { // avoid commands with non-int id arg - osdid_present = cmd_getval(cct, cmdmap, "id", osdid); + osdid_present = cmd_getval(cmdmap, "id", osdid); } if (osdid_present) { ostringstream oss; @@ -9497,7 +9497,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } int64_t prior_version = 0; - if (cmd_getval(cct, cmdmap, "prior_version", prior_version)) { + if (cmd_getval(cmdmap, "prior_version", prior_version)) { if (prior_version == osdmap.get_crush_version() - 1) { // see if we are a resend of the last update. this is imperfect // (multiple racing updaters may not both get reliable success) @@ -9585,14 +9585,14 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, return true; } else if (prefix == "osd crush set-device-class") { string device_class; - if (!cmd_getval(cct, cmdmap, "class", device_class)) { + if (!cmd_getval(cmdmap, "class", device_class)) { err = -EINVAL; // no value! goto reply; } bool stop = false; vector idvec; - cmd_getval(cct, cmdmap, "ids", idvec); + cmd_getval(cmdmap, "ids", idvec); CrushWrapper newcrush; _get_pending_crush(newcrush); set updated; @@ -9668,7 +9668,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd crush rm-device-class") { bool stop = false; vector idvec; - cmd_getval(cct, cmdmap, "ids", idvec); + cmd_getval(cmdmap, "ids", idvec); CrushWrapper newcrush; _get_pending_crush(newcrush); set updated; @@ -9728,7 +9728,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } } else if (prefix == "osd crush class create") { string device_class; - if (!cmd_getval(g_ceph_context, cmdmap, "class", device_class)) { + if (!cmd_getval(cmdmap, "class", device_class)) { err = -EINVAL; // no value! goto reply; } @@ -9757,7 +9757,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto update; } else if (prefix == "osd crush class rm") { string device_class; - if (!cmd_getval(g_ceph_context, cmdmap, "class", device_class)) { + if (!cmd_getval(cmdmap, "class", device_class)) { err = -EINVAL; // no value! goto reply; } @@ -9839,11 +9839,11 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto update; } else if (prefix == "osd crush class rename") { string srcname, dstname; - if (!cmd_getval(cct, cmdmap, "srcname", srcname)) { + if (!cmd_getval(cmdmap, "srcname", srcname)) { err = -EINVAL; goto reply; } - if (!cmd_getval(cct, cmdmap, "dstname", dstname)) { + if (!cmd_getval(cmdmap, "dstname", dstname)) { err = -EINVAL; goto reply; } @@ -9873,9 +9873,9 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, // os crush add-bucket string name, typestr; vector argvec; - cmd_getval(cct, cmdmap, "name", name); - cmd_getval(cct, cmdmap, "type", typestr); - cmd_getval(cct, cmdmap, "args", argvec); + cmd_getval(cmdmap, "name", name); + cmd_getval(cmdmap, "type", typestr); + cmd_getval(cmdmap, "args", argvec); map loc; if (!argvec.empty()) { CrushWrapper::parse_loc_map(argvec, &loc); @@ -9947,8 +9947,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto update; } else if (prefix == "osd crush rename-bucket") { string srcname, dstname; - cmd_getval(cct, cmdmap, "srcname", srcname); - cmd_getval(cct, cmdmap, "dstname", dstname); + cmd_getval(cmdmap, "srcname", srcname); + cmd_getval(cmdmap, "dstname", dstname); err = crush_rename_bucket(srcname, dstname, &ss); if (err == -EALREADY) // equivalent to success for idempotency @@ -9980,14 +9980,14 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } string poolname, mode; - cmd_getval(cct, cmdmap, "pool", poolname); + cmd_getval(cmdmap, "pool", poolname); pool = osdmap.lookup_pg_pool_name(poolname.c_str()); if (pool < 0) { ss << "pool '" << poolname << "' not found"; err = -ENOENT; goto reply; } - cmd_getval(cct, cmdmap, "mode", mode); + cmd_getval(cmdmap, "mode", mode); if (mode != "flat" && mode != "positional") { ss << "unrecognized weight-set mode '" << mode << "'"; err = -EINVAL; @@ -10018,7 +10018,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, int64_t pool; if (prefix == "osd crush weight-set rm") { string poolname; - cmd_getval(cct, cmdmap, "pool", poolname); + cmd_getval(cmdmap, "pool", poolname); pool = osdmap.lookup_pg_pool_name(poolname.c_str()); if (pool < 0) { ss << "pool '" << poolname << "' not found"; @@ -10037,9 +10037,9 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, prefix == "osd crush weight-set reweight-compat") { string poolname, item; vector weight; - cmd_getval(cct, cmdmap, "pool", poolname); - cmd_getval(cct, cmdmap, "item", item); - cmd_getval(cct, cmdmap, "weight", weight); + cmd_getval(cmdmap, "pool", poolname); + cmd_getval(cmdmap, "item", item); + cmd_getval(cmdmap, "weight", weight); CrushWrapper newcrush; _get_pending_crush(newcrush); int64_t pool; @@ -10102,7 +10102,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } double weight; - if (!cmd_getval(cct, cmdmap, "weight", weight)) { + if (!cmd_getval(cmdmap, "weight", weight)) { ss << "unable to parse weight value '" << cmd_vartype_stringify(cmdmap.at("weight")) << "'"; err = -EINVAL; @@ -10111,7 +10111,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, string args; vector argvec; - cmd_getval(cct, cmdmap, "args", argvec); + cmd_getval(cmdmap, "args", argvec); map loc; CrushWrapper::parse_loc_map(argvec, &loc); @@ -10171,7 +10171,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } double weight; - if (!cmd_getval(cct, cmdmap, "weight", weight)) { + if (!cmd_getval(cmdmap, "weight", weight)) { ss << "unable to parse weight value '" << cmd_vartype_stringify(cmdmap.at("weight")) << "'"; err = -EINVAL; @@ -10180,7 +10180,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, string args; vector argvec; - cmd_getval(cct, cmdmap, "args", argvec); + cmd_getval(cmdmap, "args", argvec); map loc; CrushWrapper::parse_loc_map(argvec, &loc); @@ -10217,8 +10217,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, // osd crush move [ ...] string name; vector argvec; - cmd_getval(cct, cmdmap, "name", name); - cmd_getval(cct, cmdmap, "args", argvec); + cmd_getval(cmdmap, "name", name); + cmd_getval(cmdmap, "args", argvec); map loc; CrushWrapper::parse_loc_map(argvec, &loc); @@ -10257,11 +10257,11 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } while (false); } else if (prefix == "osd crush swap-bucket") { string source, dest; - cmd_getval(cct, cmdmap, "source", source); - cmd_getval(cct, cmdmap, "dest", dest); + cmd_getval(cmdmap, "source", source); + cmd_getval(cmdmap, "dest", dest); bool force = false; - cmd_getval(cct, cmdmap, "yes_i_really_mean_it", force); + cmd_getval(cmdmap, "yes_i_really_mean_it", force); CrushWrapper newcrush; _get_pending_crush(newcrush); @@ -10307,9 +10307,9 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd crush link") { // osd crush link [ ...] string name; - cmd_getval(cct, cmdmap, "name", name); + cmd_getval(cmdmap, "name", name); vector argvec; - cmd_getval(cct, cmdmap, "args", argvec); + cmd_getval(cmdmap, "args", argvec); map loc; CrushWrapper::parse_loc_map(argvec, &loc); @@ -10370,7 +10370,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, _get_pending_crush(newcrush); string name; - cmd_getval(cct, cmdmap, "name", name); + cmd_getval(cmdmap, "name", name); if (!osdmap.crush->name_exists(name)) { err = 0; @@ -10390,7 +10390,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, bool unlink_only = prefix == "osd crush unlink"; string ancestor_str; - if (cmd_getval(cct, cmdmap, "ancestor", ancestor_str)) { + if (cmd_getval(cmdmap, "ancestor", ancestor_str)) { if (!newcrush.name_exists(ancestor_str)) { err = -ENOENT; ss << "ancestor item '" << ancestor_str @@ -10439,7 +10439,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, _get_pending_crush(newcrush); string name; - cmd_getval(cct, cmdmap, "name", name); + cmd_getval(cmdmap, "name", name); if (!newcrush.name_exists(name)) { err = -ENOENT; ss << "device '" << name << "' does not appear in the crush map"; @@ -10453,7 +10453,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } double w; - if (!cmd_getval(cct, cmdmap, "weight", w)) { + if (!cmd_getval(cmdmap, "weight", w)) { ss << "unable to parse weight value '" << cmd_vartype_stringify(cmdmap.at("weight")) << "'"; err = -EINVAL; @@ -10478,7 +10478,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, _get_pending_crush(newcrush); string name; - cmd_getval(cct, cmdmap, "name", name); + cmd_getval(cmdmap, "name", name); if (!newcrush.name_exists(name)) { err = -ENOENT; ss << "device '" << name << "' does not appear in the crush map"; @@ -10492,7 +10492,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } double w; - if (!cmd_getval(cct, cmdmap, "weight", w)) { + if (!cmd_getval(cmdmap, "weight", w)) { ss << "unable to parse weight value '" << cmd_vartype_stringify(cmdmap.at("weight")) << "'"; err = -EINVAL; @@ -10517,7 +10517,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, err = 0; string profile; - cmd_getval(cct, cmdmap, "profile", profile); + cmd_getval(cmdmap, "profile", profile); if (profile == "legacy" || profile == "argonaut") { newcrush.set_tunables_legacy(); } else if (profile == "bobtail") { @@ -10556,10 +10556,10 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, err = 0; string tunable; - cmd_getval(cct, cmdmap, "tunable", tunable); + cmd_getval(cmdmap, "tunable", tunable); int64_t value = -1; - if (!cmd_getval(cct, cmdmap, "value", value)) { + if (!cmd_getval(cmdmap, "value", value)) { err = -EINVAL; ss << "failed to parse integer value " << cmd_vartype_stringify(cmdmap.at("value")); @@ -10594,10 +10594,10 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd crush rule create-simple") { string name, root, type, mode; - cmd_getval(cct, cmdmap, "name", name); - cmd_getval(cct, cmdmap, "root", root); - cmd_getval(cct, cmdmap, "type", type); - cmd_getval(cct, cmdmap, "mode", mode); + cmd_getval(cmdmap, "name", name); + cmd_getval(cmdmap, "root", root); + cmd_getval(cmdmap, "type", type); + cmd_getval(cmdmap, "mode", mode); if (mode == "") mode = "firstn"; @@ -10635,10 +10635,10 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd crush rule create-replicated") { string name, root, type, device_class; - cmd_getval(cct, cmdmap, "name", name); - cmd_getval(cct, cmdmap, "root", root); - cmd_getval(cct, cmdmap, "type", type); - cmd_getval(cct, cmdmap, "class", device_class); + cmd_getval(cmdmap, "name", name); + cmd_getval(cmdmap, "root", root); + cmd_getval(cmdmap, "type", type); + cmd_getval(cmdmap, "class", device_class); if (osdmap.crush->rule_exists(name)) { // The name is uniquely associated to a ruleid and the rule it contains @@ -10675,7 +10675,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd erasure-code-profile rm") { string name; - cmd_getval(cct, cmdmap, "name", name); + cmd_getval(cmdmap, "name", name); if (erasure_code_profile_in_use(pending_inc.new_pools, name, &ss)) goto wait; @@ -10706,12 +10706,12 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd erasure-code-profile set") { string name; - cmd_getval(cct, cmdmap, "name", name); + cmd_getval(cmdmap, "name", name); vector profile; - cmd_getval(cct, cmdmap, "profile", profile); + cmd_getval(cmdmap, "profile", profile); bool force = false; - cmd_getval(cct, cmdmap, "force", force); + cmd_getval(cmdmap, "force", force); map profile_map; err = parse_erasure_code_profile(profile, &profile_map, &ss); @@ -10772,9 +10772,9 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, if (err) goto reply; string name, poolstr; - cmd_getval(cct, cmdmap, "name", name); + cmd_getval(cmdmap, "name", name); string profile; - cmd_getval(cct, cmdmap, "profile", profile); + cmd_getval(cmdmap, "profile", profile); if (profile == "") profile = "default"; if (profile == "default") { @@ -10828,7 +10828,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd crush rule rm") { string name; - cmd_getval(cct, cmdmap, "name", name); + cmd_getval(cmdmap, "name", name); if (!osdmap.crush->rule_exists(name)) { ss << "rule " << name << " does not exist"; @@ -10872,8 +10872,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd crush rule rename") { string srcname; string dstname; - cmd_getval(cct, cmdmap, "srcname", srcname); - cmd_getval(cct, cmdmap, "dstname", dstname); + cmd_getval(cmdmap, "srcname", srcname); + cmd_getval(cmdmap, "dstname", dstname); if (srcname.empty() || dstname.empty()) { ss << "must specify both source rule name and destination rule name"; err = -EINVAL; @@ -10910,7 +10910,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd setmaxosd") { int64_t newmax; - if (!cmd_getval(cct, cmdmap, "newmax", newmax)) { + if (!cmd_getval(cmdmap, "newmax", newmax)) { ss << "unable to parse 'newmax' value '" << cmd_vartype_stringify(cmdmap.at("newmax")) << "'"; err = -EINVAL; @@ -10952,7 +10952,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, prefix == "osd set-backfillfull-ratio" || prefix == "osd set-nearfull-ratio") { double n; - if (!cmd_getval(cct, cmdmap, "ratio", n)) { + if (!cmd_getval(cmdmap, "ratio", n)) { ss << "unable to parse 'ratio' value '" << cmd_vartype_stringify(cmdmap.at("ratio")) << "'"; err = -EINVAL; @@ -10971,7 +10971,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, return true; } else if (prefix == "osd set-require-min-compat-client") { string v; - cmd_getval(cct, cmdmap, "version", v); + cmd_getval(cmdmap, "version", v); ceph_release_t vno = ceph_release_from_name(v); if (!vno) { ss << "version " << v << " is not recognized"; @@ -10990,7 +10990,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } bool sure = false; - cmd_getval(cct, cmdmap, "yes_i_really_mean_it", sure); + cmd_getval(cmdmap, "yes_i_really_mean_it", sure); if (!sure) { FeatureMap m; mon->get_combined_feature_map(&m); @@ -11042,10 +11042,10 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd set") { bool sure = false; - cmd_getval(g_ceph_context, cmdmap, "yes_i_really_mean_it", sure); + cmd_getval(cmdmap, "yes_i_really_mean_it", sure); string key; - cmd_getval(cct, cmdmap, "key", key); + cmd_getval(cmdmap, "key", key); if (key == "pause") return prepare_set_flag(op, CEPH_OSDMAP_PAUSERD | CEPH_OSDMAP_PAUSEWR); else if (key == "noup") @@ -11095,7 +11095,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd unset") { string key; - cmd_getval(cct, cmdmap, "key", key); + cmd_getval(cmdmap, "key", key); if (key == "pause") return prepare_unset_flag(op, CEPH_OSDMAP_PAUSERD | CEPH_OSDMAP_PAUSEWR); else if (key == "noup") @@ -11127,9 +11127,9 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd require-osd-release") { string release; - cmd_getval(cct, cmdmap, "release", release); + cmd_getval(cmdmap, "release", release); bool sure = false; - cmd_getval(cct, cmdmap, "yes_i_really_mean_it", sure); + cmd_getval(cmdmap, "yes_i_really_mean_it", sure); ceph_release_t rel = ceph_release_from_name(release.c_str()); if (!rel) { ss << "unrecognized release " << release; @@ -11211,8 +11211,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, bool definitely_dead = false; vector idvec; - cmd_getval(cct, cmdmap, "ids", idvec); - cmd_getval(cct, cmdmap, "definitely_dead", definitely_dead); + cmd_getval(cmdmap, "ids", idvec); + cmd_getval(cmdmap, "definitely_dead", definitely_dead); derr << "definitely_dead " << (int)definitely_dead << dendl; for (unsigned j = 0; j < idvec.size() && !stop; j++) { set osds; @@ -11359,8 +11359,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, unsigned flags = 0; vector who; if (prefix == "osd set-group" || prefix == "osd unset-group") { - cmd_getval(cct, cmdmap, "flags", flag_str); - cmd_getval(cct, cmdmap, "who", who); + cmd_getval(cmdmap, "flags", flag_str); + cmd_getval(cmdmap, "who", who); vector raw_flags; boost::split(raw_flags, flag_str, boost::is_any_of(",")); for (auto& f : raw_flags) { @@ -11380,7 +11380,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } } } else { - cmd_getval(cct, cmdmap, "ids", who); + cmd_getval(cmdmap, "ids", who); if (prefix.find("noup") != string::npos) flags = CEPH_OSD_NOUP; else if (prefix.find("nodown") != string::npos) @@ -11507,7 +11507,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } } else if (prefix == "osd pg-temp") { string pgidstr; - if (!cmd_getval(cct, cmdmap, "pgid", pgidstr)) { + if (!cmd_getval(cmdmap, "pgid", pgidstr)) { ss << "unable to parse 'pgid' value '" << cmd_vartype_stringify(cmdmap.at("pgid")) << "'"; err = -EINVAL; @@ -11532,7 +11532,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, vector id_vec; vector new_pg_temp; - cmd_getval(cct, cmdmap, "id", id_vec); + cmd_getval(cmdmap, "id", id_vec); if (id_vec.empty()) { pending_inc.new_pg_temp[pgid] = mempool::osdmap::vector(); ss << "done cleaning up pg_temp of " << pgid; @@ -11569,7 +11569,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto update; } else if (prefix == "osd primary-temp") { string pgidstr; - if (!cmd_getval(cct, cmdmap, "pgid", pgidstr)) { + if (!cmd_getval(cmdmap, "pgid", pgidstr)) { ss << "unable to parse 'pgid' value '" << cmd_vartype_stringify(cmdmap.at("pgid")) << "'"; err = -EINVAL; @@ -11588,7 +11588,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } int64_t osd; - if (!cmd_getval(cct, cmdmap, "id", osd)) { + if (!cmd_getval(cmdmap, "id", osd)) { ss << "unable to parse 'id' value '" << cmd_vartype_stringify(cmdmap.at("id")) << "'"; err = -EINVAL; @@ -11615,7 +11615,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "pg repeer") { pg_t pgid; string pgidstr; - cmd_getval(cct, cmdmap, "pgid", pgidstr); + cmd_getval(cmdmap, "pgid", pgidstr); if (!pgid.parse(pgidstr.c_str())) { ss << "invalid pgid '" << pgidstr << "'"; err = -EINVAL; @@ -11676,7 +11676,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, if (err < 0) goto reply; string pgidstr; - if (!cmd_getval(cct, cmdmap, "pgid", pgidstr)) { + if (!cmd_getval(cmdmap, "pgid", pgidstr)) { ss << "unable to parse 'pgid' value '" << cmd_vartype_stringify(cmdmap.at("pgid")) << "'"; err = -EINVAL; @@ -11751,7 +11751,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, case OP_PG_UPMAP: { vector id_vec; - if (!cmd_getval(cct, cmdmap, "id", id_vec)) { + if (!cmd_getval(cmdmap, "id", id_vec)) { ss << "unable to parse 'id' value(s) '" << cmd_vartype_stringify(cmdmap.at("id")) << "'"; err = -EINVAL; @@ -11811,7 +11811,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, case OP_PG_UPMAP_ITEMS: { vector id_vec; - if (!cmd_getval(cct, cmdmap, "id", id_vec)) { + if (!cmd_getval(cmdmap, "id", id_vec)) { ss << "unable to parse 'id' value(s) '" << cmd_vartype_stringify(cmdmap.at("id")) << "'"; err = -EINVAL; @@ -11893,14 +11893,14 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto update; } else if (prefix == "osd primary-affinity") { int64_t id; - if (!cmd_getval(cct, cmdmap, "id", id)) { + if (!cmd_getval(cmdmap, "id", id)) { ss << "invalid osd id value '" << cmd_vartype_stringify(cmdmap.at("id")) << "'"; err = -EINVAL; goto reply; } double w; - if (!cmd_getval(cct, cmdmap, "weight", w)) { + if (!cmd_getval(cmdmap, "weight", w)) { ss << "unable to parse 'weight' value '" << cmd_vartype_stringify(cmdmap.at("weight")) << "'"; err = -EINVAL; @@ -11934,14 +11934,14 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } } else if (prefix == "osd reweight") { int64_t id; - if (!cmd_getval(cct, cmdmap, "id", id)) { + if (!cmd_getval(cmdmap, "id", id)) { ss << "unable to parse osd id value '" << cmd_vartype_stringify(cmdmap.at("id")) << "'"; err = -EINVAL; goto reply; } double w; - if (!cmd_getval(cct, cmdmap, "weight", w)) { + if (!cmd_getval(cmdmap, "weight", w)) { ss << "unable to parse weight value '" << cmd_vartype_stringify(cmdmap.at("weight")) << "'"; err = -EINVAL; @@ -11980,14 +11980,14 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, return true; } else if (prefix == "osd lost") { int64_t id; - if (!cmd_getval(cct, cmdmap, "id", id)) { + if (!cmd_getval(cmdmap, "id", id)) { ss << "unable to parse osd id value '" << cmd_vartype_stringify(cmdmap.at("id")) << "'"; err = -EINVAL; goto reply; } bool sure = false; - cmd_getval(g_ceph_context, cmdmap, "yes_i_really_mean_it", sure); + cmd_getval(cmdmap, "yes_i_really_mean_it", sure); if (!sure) { ss << "are you SURE? this might mean real, permanent data loss. pass " "--yes-i-really-mean-it if you really do."; @@ -12035,7 +12035,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } int64_t id; - if (!cmd_getval(cct, cmdmap, "id", id)) { + if (!cmd_getval(cmdmap, "id", id)) { auto p = cmdmap.find("id"); if (p == cmdmap.end()) { ss << "no osd id specified"; @@ -12054,7 +12054,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } bool sure = false; - cmd_getval(g_ceph_context, cmdmap, "yes_i_really_mean_it", sure); + cmd_getval(cmdmap, "yes_i_really_mean_it", sure); if (!sure) { ss << "Are you SURE? Did you verify with 'ceph osd safe-to-destroy'? " << "This will mean real, permanent data loss, as well " @@ -12168,7 +12168,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, // optional id provided? int64_t id = -1, cmd_id = -1; - if (cmd_getval(cct, cmdmap, "id", cmd_id)) { + if (cmd_getval(cmdmap, "id", cmd_id)) { if (cmd_id < 0) { ss << "invalid osd id value '" << cmd_id << "'"; err = -EINVAL; @@ -12179,7 +12179,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, uuid_d uuid; string uuidstr; - if (cmd_getval(cct, cmdmap, "uuid", uuidstr)) { + if (cmd_getval(cmdmap, "uuid", uuidstr)) { if (!uuid.parse(uuidstr.c_str())) { ss << "invalid uuid value '" << uuidstr << "'"; err = -EINVAL; @@ -12246,7 +12246,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, return true; } else if (prefix == "osd blacklist") { string addrstr; - cmd_getval(cct, cmdmap, "addr", addrstr); + cmd_getval(cmdmap, "addr", addrstr); entity_addr_t addr; if (!addr.parse(addrstr.c_str(), 0)) { ss << "unable to parse address " << addrstr; @@ -12262,12 +12262,12 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } string blacklistop; - cmd_getval(cct, cmdmap, "blacklistop", blacklistop); + cmd_getval(cmdmap, "blacklistop", blacklistop); if (blacklistop == "add") { utime_t expires = ceph_clock_now(); double d; // default one hour - cmd_getval(cct, cmdmap, "expire", d, + cmd_getval(cmdmap, "expire", d, g_conf()->mon_osd_blacklist_default_expire); expires += d; @@ -12307,7 +12307,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } } else if (prefix == "osd pool mksnap") { string poolstr; - cmd_getval(cct, cmdmap, "pool", poolstr); + cmd_getval(cmdmap, "pool", poolstr); int64_t pool = osdmap.lookup_pg_pool_name(poolstr.c_str()); if (pool < 0) { ss << "unrecognized pool '" << poolstr << "'"; @@ -12315,7 +12315,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } string snapname; - cmd_getval(cct, cmdmap, "snap", snapname); + cmd_getval(cmdmap, "snap", snapname); const pg_pool_t *p = osdmap.get_pg_pool(pool); if (p->is_unmanaged_snaps_mode()) { ss << "pool " << poolstr << " is in unmanaged snaps mode"; @@ -12350,7 +12350,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, return true; } else if (prefix == "osd pool rmsnap") { string poolstr; - cmd_getval(cct, cmdmap, "pool", poolstr); + cmd_getval(cmdmap, "pool", poolstr); int64_t pool = osdmap.lookup_pg_pool_name(poolstr.c_str()); if (pool < 0) { ss << "unrecognized pool '" << poolstr << "'"; @@ -12358,7 +12358,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } string snapname; - cmd_getval(cct, cmdmap, "snap", snapname); + cmd_getval(cmdmap, "snap", snapname); const pg_pool_t *p = osdmap.get_pg_pool(pool); if (p->is_unmanaged_snaps_mode()) { ss << "pool " << poolstr << " is in unmanaged snaps mode"; @@ -12391,17 +12391,17 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd pool create") { int64_t pg_num, pg_num_min; int64_t pgp_num; - cmd_getval(cct, cmdmap, "pg_num", pg_num, int64_t(0)); - cmd_getval(cct, cmdmap, "pgp_num", pgp_num, pg_num); - cmd_getval(cct, cmdmap, "pg_num_min", pg_num_min, int64_t(0)); + cmd_getval(cmdmap, "pg_num", pg_num, int64_t(0)); + cmd_getval(cmdmap, "pgp_num", pgp_num, pg_num); + cmd_getval(cmdmap, "pg_num_min", pg_num_min, int64_t(0)); string pool_type_str; - cmd_getval(cct, cmdmap, "pool_type", pool_type_str); + cmd_getval(cmdmap, "pool_type", pool_type_str); if (pool_type_str.empty()) pool_type_str = g_conf().get_val("osd_pool_default_type"); string poolstr; - cmd_getval(cct, cmdmap, "pool", poolstr); + cmd_getval(cmdmap, "pool", poolstr); int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr); if (pool_id >= 0) { const pg_pool_t *p = osdmap.get_pg_pool(pool_id); @@ -12429,9 +12429,9 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, bool implicit_rule_creation = false; int64_t expected_num_objects = 0; string rule_name; - cmd_getval(cct, cmdmap, "rule", rule_name); + cmd_getval(cmdmap, "rule", rule_name); string erasure_code_profile; - cmd_getval(cct, cmdmap, "erasure_code_profile", erasure_code_profile); + cmd_getval(cmdmap, "erasure_code_profile", erasure_code_profile); if (pool_type == pg_pool_t::TYPE_ERASURE) { if (erasure_code_profile == "") @@ -12465,7 +12465,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, rule_name = poolstr; } } - cmd_getval(g_ceph_context, cmdmap, "expected_num_objects", + cmd_getval(cmdmap, "expected_num_objects", expected_num_objects, int64_t(0)); } else { //NOTE:for replicated pool,cmd_map will put rule_name to erasure_code_profile field @@ -12482,7 +12482,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } rule_name = erasure_code_profile; } else { // cmd is well-formed - cmd_getval(g_ceph_context, cmdmap, "expected_num_objects", + cmd_getval(cmdmap, "expected_num_objects", expected_num_objects, int64_t(0)); } } @@ -12524,7 +12524,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } int64_t fast_read_param; - cmd_getval(cct, cmdmap, "fast_read", fast_read_param, int64_t(-1)); + cmd_getval(cmdmap, "fast_read", fast_read_param, int64_t(-1)); FastReadType fast_read = FAST_READ_DEFAULT; if (fast_read_param == 0) fast_read = FAST_READ_OFF; @@ -12532,11 +12532,11 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, fast_read = FAST_READ_ON; int64_t repl_size = 0; - cmd_getval(cct, cmdmap, "size", repl_size); + cmd_getval(cmdmap, "size", repl_size); int64_t target_size_bytes = 0; double target_size_ratio = 0.0; - cmd_getval(cct, cmdmap, "target_size_bytes", target_size_bytes); - cmd_getval(cct, cmdmap, "target_size_ratio", target_size_ratio); + cmd_getval(cmdmap, "target_size_bytes", target_size_bytes); + cmd_getval(cmdmap, "target_size_ratio", target_size_ratio); err = prepare_new_pool(poolstr, -1, // default crush rule @@ -12573,8 +12573,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, prefix == "osd pool rm") { // osd pool delete/rm --yes-i-really-really-mean-it string poolstr, poolstr2, sure; - cmd_getval(cct, cmdmap, "pool", poolstr); - cmd_getval(cct, cmdmap, "pool2", poolstr2); + cmd_getval(cmdmap, "pool", poolstr); + cmd_getval(cmdmap, "pool2", poolstr2); int64_t pool = osdmap.lookup_pg_pool_name(poolstr.c_str()); if (pool < 0) { ss << "pool '" << poolstr << "' does not exist"; @@ -12583,9 +12583,9 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } bool force_no_fake = false; - cmd_getval(cct, cmdmap, "yes_i_really_really_mean_it", force_no_fake); + cmd_getval(cmdmap, "yes_i_really_really_mean_it", force_no_fake); bool force = false; - cmd_getval(cct, cmdmap, "yes_i_really_really_mean_it_not_faking", force); + cmd_getval(cmdmap, "yes_i_really_really_mean_it_not_faking", force); if (poolstr2 != poolstr || (!force && !force_no_fake)) { ss << "WARNING: this will *PERMANENTLY DESTROY* all data stored in pool " << poolstr @@ -12604,8 +12604,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto update; } else if (prefix == "osd pool rename") { string srcpoolstr, destpoolstr; - cmd_getval(cct, cmdmap, "srcpool", srcpoolstr); - cmd_getval(cct, cmdmap, "destpool", destpoolstr); + cmd_getval(cmdmap, "srcpool", srcpoolstr); + cmd_getval(cmdmap, "destpool", destpoolstr); int64_t pool_src = osdmap.lookup_pg_pool_name(srcpoolstr.c_str()); int64_t pool_dst = osdmap.lookup_pg_pool_name(destpoolstr.c_str()); @@ -12662,7 +12662,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, if (err) goto reply; string poolstr; - cmd_getval(cct, cmdmap, "pool", poolstr); + cmd_getval(cmdmap, "pool", poolstr); int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr); if (pool_id < 0) { ss << "unrecognized pool '" << poolstr << "'"; @@ -12670,7 +12670,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } string tierpoolstr; - cmd_getval(cct, cmdmap, "tierpool", tierpoolstr); + cmd_getval(cmdmap, "tierpool", tierpoolstr); int64_t tierpool_id = osdmap.lookup_pg_pool_name(tierpoolstr); if (tierpool_id < 0) { ss << "unrecognized pool '" << tierpoolstr << "'"; @@ -12688,7 +12688,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, // make sure new tier is empty string force_nonempty; - cmd_getval(cct, cmdmap, "force_nonempty", force_nonempty); + cmd_getval(cmdmap, "force_nonempty", force_nonempty); const pool_stat_t *pstats = mon->mgrstatmon()->get_pool_stat(tierpool_id); if (pstats && pstats->stats.sum.num_objects != 0 && force_nonempty != "--force-nonempty") { @@ -12726,7 +12726,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd tier remove" || prefix == "osd tier rm") { string poolstr; - cmd_getval(cct, cmdmap, "pool", poolstr); + cmd_getval(cmdmap, "pool", poolstr); int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr); if (pool_id < 0) { ss << "unrecognized pool '" << poolstr << "'"; @@ -12734,7 +12734,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } string tierpoolstr; - cmd_getval(cct, cmdmap, "tierpool", tierpoolstr); + cmd_getval(cmdmap, "tierpool", tierpoolstr); int64_t tierpool_id = osdmap.lookup_pg_pool_name(tierpoolstr); if (tierpool_id < 0) { ss << "unrecognized pool '" << tierpoolstr << "'"; @@ -12790,7 +12790,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, if (err) goto reply; string poolstr; - cmd_getval(cct, cmdmap, "pool", poolstr); + cmd_getval(cmdmap, "pool", poolstr); int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr); if (pool_id < 0) { ss << "unrecognized pool '" << poolstr << "'"; @@ -12798,7 +12798,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } string overlaypoolstr; - cmd_getval(cct, cmdmap, "overlaypool", overlaypoolstr); + cmd_getval(cmdmap, "overlaypool", overlaypoolstr); int64_t overlaypool_id = osdmap.lookup_pg_pool_name(overlaypoolstr); if (overlaypool_id < 0) { ss << "unrecognized pool '" << overlaypoolstr << "'"; @@ -12843,7 +12843,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd tier remove-overlay" || prefix == "osd tier rm-overlay") { string poolstr; - cmd_getval(cct, cmdmap, "pool", poolstr); + cmd_getval(cmdmap, "pool", poolstr); int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr); if (pool_id < 0) { ss << "unrecognized pool '" << poolstr << "'"; @@ -12888,7 +12888,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, if (err) goto reply; string poolstr; - cmd_getval(cct, cmdmap, "pool", poolstr); + cmd_getval(cmdmap, "pool", poolstr); int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr); if (pool_id < 0) { ss << "unrecognized pool '" << poolstr << "'"; @@ -12903,7 +12903,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } string modestr; - cmd_getval(cct, cmdmap, "mode", modestr); + cmd_getval(cmdmap, "mode", modestr); pg_pool_t::cache_mode_t mode = pg_pool_t::get_cache_mode_from_str(modestr); if (int(mode) < 0) { ss << "'" << modestr << "' is not a valid cache mode"; @@ -12912,7 +12912,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } bool sure = false; - cmd_getval(cct, cmdmap, "yes_i_really_mean_it", sure); + cmd_getval(cmdmap, "yes_i_really_mean_it", sure); if (mode == pg_pool_t::CACHEMODE_FORWARD || mode == pg_pool_t::CACHEMODE_READFORWARD) { @@ -13033,7 +13033,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, if (err) goto reply; string poolstr; - cmd_getval(cct, cmdmap, "pool", poolstr); + cmd_getval(cmdmap, "pool", poolstr); int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr); if (pool_id < 0) { ss << "unrecognized pool '" << poolstr << "'"; @@ -13041,7 +13041,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } string tierpoolstr; - cmd_getval(cct, cmdmap, "tierpool", tierpoolstr); + cmd_getval(cmdmap, "tierpool", tierpoolstr); int64_t tierpool_id = osdmap.lookup_pg_pool_name(tierpoolstr); if (tierpool_id < 0) { ss << "unrecognized pool '" << tierpoolstr << "'"; @@ -13058,7 +13058,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } int64_t size = 0; - if (!cmd_getval(cct, cmdmap, "size", size)) { + if (!cmd_getval(cmdmap, "size", size)) { ss << "unable to parse 'size' value '" << cmd_vartype_stringify(cmdmap.at("size")) << "'"; err = -EINVAL; @@ -13124,7 +13124,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, return true; } else if (prefix == "osd pool set-quota") { string poolstr; - cmd_getval(cct, cmdmap, "pool", poolstr); + cmd_getval(cmdmap, "pool", poolstr); int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr); if (pool_id < 0) { ss << "unrecognized pool '" << poolstr << "'"; @@ -13133,7 +13133,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } string field; - cmd_getval(cct, cmdmap, "field", field); + cmd_getval(cmdmap, "field", field); if (field != "max_objects" && field != "max_bytes") { ss << "unrecognized field '" << field << "'; should be 'max_bytes' or 'max_objects'"; err = -EINVAL; @@ -13142,7 +13142,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, // val could contain unit designations, so we treat as a string string val; - cmd_getval(cct, cmdmap, "val", val); + cmd_getval(cmdmap, "val", val); string tss; int64_t value; if (field == "max_objects") { @@ -13186,7 +13186,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, } else if (prefix == "osd force-create-pg") { pg_t pgid; string pgidstr; - cmd_getval(cct, cmdmap, "pgid", pgidstr); + cmd_getval(cmdmap, "pgid", pgidstr); if (!pgid.parse(pgidstr.c_str())) { ss << "invalid pgid '" << pgidstr << "'"; err = -EINVAL; @@ -13198,7 +13198,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } bool sure = false; - cmd_getval(cct, cmdmap, "yes_i_really_mean_it", sure); + cmd_getval(cmdmap, "yes_i_really_mean_it", sure); if (!sure) { ss << "This command will recreate a lost (as in data lost) PG with data in it, such " << "that the cluster will give up ever trying to recover the lost data. Do this " diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc index 896136686d93f..e78508d4b4623 100644 --- a/src/mon/PGMap.cc +++ b/src/mon/PGMap.cc @@ -3444,7 +3444,7 @@ int process_pg_map_command( } else if (prefix == "pg ls-by-pool") { prefix = "pg ls"; string poolstr; - cmd_getval(g_ceph_context, cmdmap, "poolstr", poolstr); + cmd_getval(cmdmap, "poolstr", poolstr); int64_t pool = osdmap.lookup_pg_pool_name(poolstr.c_str()); if (pool < 0) { *ss << "pool " << poolstr << " does not exist"; @@ -3477,7 +3477,7 @@ int process_pg_map_command( string val; vector dumpcontents; set what; - if (cmd_getval(g_ceph_context, cmdmap, "dumpcontents", dumpcontents)) { + if (cmd_getval(cmdmap, "dumpcontents", dumpcontents)) { copy(dumpcontents.begin(), dumpcontents.end(), inserter(what, what.end())); } @@ -3553,9 +3553,9 @@ int process_pg_map_command( int64_t pool = -1; vectorstates; set pgs; - cmd_getval(g_ceph_context, cmdmap, "pool", pool); - cmd_getval(g_ceph_context, cmdmap, "osd", osd); - cmd_getval(g_ceph_context, cmdmap, "states", states); + cmd_getval(cmdmap, "pool", pool); + cmd_getval(cmdmap, "osd", osd); + cmd_getval(cmdmap, "states", states); if (pool >= 0 && !osdmap.have_pg_pool(pool)) { *ss << "pool " << pool << " does not exist"; return -ENOENT; @@ -3603,11 +3603,11 @@ int process_pg_map_command( if (prefix == "pg dump_stuck") { vector stuckop_vec; - cmd_getval(g_ceph_context, cmdmap, "stuckops", stuckop_vec); + cmd_getval(cmdmap, "stuckops", stuckop_vec); if (stuckop_vec.empty()) stuckop_vec.push_back("unclean"); int64_t threshold; - cmd_getval(g_ceph_context, cmdmap, "threshold", threshold, + cmd_getval(cmdmap, "threshold", threshold, g_conf().get_val("mon_pg_stuck_threshold")); if (pg_map.dump_stuck_pg_stats(ds, f, (int)threshold, stuckop_vec) < 0) { @@ -3621,7 +3621,7 @@ int process_pg_map_command( if (prefix == "pg debug") { string debugop; - cmd_getval(g_ceph_context, cmdmap, "debugop", debugop, + cmd_getval(cmdmap, "debugop", debugop, string("unfound_objects_exist")); if (debugop == "unfound_objects_exist") { bool unfound_objects_exist = false; diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index 030039d3dc0d3..7664b713260ea 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -86,7 +86,7 @@ private: bufferlist& out) override { if (command == "bluestore bluefs available") { int64_t alloc_size = 0; - cmd_getval(bluefs->cct, cmdmap, "alloc_size", alloc_size); + cmd_getval(cmdmap, "alloc_size", alloc_size); if ((alloc_size & (alloc_size - 1)) != 0) { ss << "Invalid allocation size:'" << alloc_size << std::endl; return -EINVAL; diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 6d71190087425..54aa67074f3e1 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -2410,7 +2410,7 @@ void OSD::asok_command( ) { string pgidstr; pg_t pgid; - if (!cmd_getval(cct, cmdmap, "pgid", pgidstr)) { + if (!cmd_getval(cmdmap, "pgid", pgidstr)) { ss << "no pgid specified"; ret = -EINVAL; goto out; @@ -2478,7 +2478,7 @@ will start to track new ops received afterwards."; set filters; vector filter_str; - if (cmd_getval(cct, cmdmap, "filterstr", filter_str)) { + if (cmd_getval(cmdmap, "filterstr", filter_str)) { copy(filter_str.begin(), filter_str.end(), inserter(filters, filters.end())); } @@ -2594,10 +2594,10 @@ will start to track new ops received afterwards."; int64_t value = 0; string error; bool success = false; - if (!cmd_getval(cct, cmdmap, "property", property)) { + if (!cmd_getval(cmdmap, "property", property)) { error = "unable to get property"; success = false; - } else if (!cmd_getval(cct, cmdmap, "value", value)) { + } else if (!cmd_getval(cmdmap, "value", value)) { error = "unable to get value"; success = false; } else if (value < 0) { @@ -2618,7 +2618,7 @@ will start to track new ops received afterwards."; size_t value = 0; string error; bool success = false; - if (!cmd_getval(cct, cmdmap, "property", property)) { + if (!cmd_getval(cmdmap, "property", property)) { error = "unable to get property"; success = false; } else if (!ceph_heap_get_numeric_property(property.c_str(), &value)) { @@ -2675,7 +2675,7 @@ will start to track new ops received afterwards."; f->close_section(); } else if (prefix == "smart") { string devid; - cmd_getval(cct, cmdmap, "devid", devid); + cmd_getval(cmdmap, "devid", devid); ostringstream out; probe_smart(devid, out); outbl.append(out.str()); @@ -2703,7 +2703,7 @@ will start to track new ops received afterwards."; else if (prefix == "cluster_log") { vector msg; - cmd_getval(cct, cmdmap, "message", msg); + cmd_getval(cmdmap, "message", msg); if (msg.empty()) { ret = -EINVAL; ss << "ignoring empty log message"; @@ -2713,7 +2713,7 @@ will start to track new ops received afterwards."; for (vector::iterator a = ++msg.begin(); a != msg.end(); ++a) message += " " + *a; string lvl; - cmd_getval(cct, cmdmap, "level", lvl); + cmd_getval(cmdmap, "level", lvl); clog_type level = string_to_clog_type(lvl); if (level < 0) { ret = -EINVAL; @@ -2729,10 +2729,10 @@ will start to track new ops received afterwards."; int64_t bsize; int64_t osize, onum; // default count 1G, size 4MB - cmd_getval(cct, cmdmap, "count", count, (int64_t)1 << 30); - cmd_getval(cct, cmdmap, "size", bsize, (int64_t)4 << 20); - cmd_getval(cct, cmdmap, "object_size", osize, (int64_t)0); - cmd_getval(cct, cmdmap, "object_num", onum, (int64_t)0); + cmd_getval(cmdmap, "count", count, (int64_t)1 << 30); + cmd_getval(cmdmap, "size", bsize, (int64_t)4 << 20); + cmd_getval(cmdmap, "object_size", osize, (int64_t)0); + cmd_getval(cmdmap, "object_num", onum, (int64_t)0); uint32_t duration = cct->_conf->osd_bench_duration; @@ -2901,7 +2901,7 @@ will start to track new ops received afterwards."; else if (prefix == "debug kick_recovery_wq") { int64_t delay; - cmd_getval(cct, cmdmap, "delay", delay); + cmd_getval(cmdmap, "delay", delay); ostringstream oss; oss << delay; ret = cct->_conf.set_val("osd_recovery_delay_start", oss.str().c_str()); @@ -2919,7 +2919,7 @@ will start to track new ops received afterwards."; else if (prefix == "cpu_profiler") { ostringstream ds; string arg; - cmd_getval(cct, cmdmap, "arg", arg); + cmd_getval(cmdmap, "arg", arg); vector argvec; get_str_vec(arg, argvec); cpu_profiler_handle_command(argvec, ds); @@ -2939,8 +2939,8 @@ will start to track new ops received afterwards."; else if (prefix == "perf histogram dump") { std::string logger; std::string counter; - cmd_getval(cct, cmdmap, "logger", logger); - cmd_getval(cct, cmdmap, "counter", counter); + cmd_getval(cmdmap, "logger", logger); + cmd_getval(cmdmap, "counter", counter); cct->get_perfcounters_collection()->dump_formatted_histograms( f, false, logger, counter); } @@ -2985,7 +2985,7 @@ will start to track new ops received afterwards."; else if (prefix == "dump_osd_network") { lock_guard l(osd_lock); int64_t value = 0; - if (!(cmd_getval(cct, cmdmap, "value", value))) { + if (!(cmd_getval(cmdmap, "value", value))) { // Convert milliseconds to microseconds value = static_cast(g_conf().get_val( "mon_warn_on_slow_ping_time")) * 1000; @@ -5945,7 +5945,7 @@ void TestOpsSocketHook::test_ops(OSDService *service, ObjectStore *store, string poolstr; - cmd_getval(service->cct, cmdmap, "pool", poolstr); + cmd_getval(cmdmap, "pool", poolstr); pool = curmap->lookup_pg_pool_name(poolstr); //If we can't find it by name then maybe id specified if (pool < 0 && isdigit(poolstr[0])) @@ -5956,7 +5956,7 @@ void TestOpsSocketHook::test_ops(OSDService *service, ObjectStore *store, } string objname, nspace; - cmd_getval(service->cct, cmdmap, "objname", objname); + cmd_getval(cmdmap, "objname", objname); std::size_t found = objname.find_first_of('/'); if (found != string::npos) { nspace = objname.substr(0, found); @@ -5971,7 +5971,7 @@ void TestOpsSocketHook::test_ops(OSDService *service, ObjectStore *store, } int64_t shardid; - cmd_getval(service->cct, cmdmap, "shardid", shardid, int64_t(shard_id_t::NO_SHARD)); + cmd_getval(cmdmap, "shardid", shardid, int64_t(shard_id_t::NO_SHARD)); hobject_t obj(object_t(objname), string(""), CEPH_NOSNAP, rawpg.ps(), pool, nspace); ghobject_t gobj(obj, ghobject_t::NO_GEN, shard_id_t(uint8_t(shardid))); spg_t pgid(curmap->raw_pg_to_pg(rawpg), shard_id_t(shardid)); @@ -5988,8 +5988,8 @@ void TestOpsSocketHook::test_ops(OSDService *service, ObjectStore *store, map newattrs; bufferlist val; string key, valstr; - cmd_getval(service->cct, cmdmap, "key", key); - cmd_getval(service->cct, cmdmap, "val", valstr); + cmd_getval(cmdmap, "key", key); + cmd_getval(cmdmap, "val", valstr); val.append(valstr); newattrs[key] = val; @@ -6001,7 +6001,7 @@ void TestOpsSocketHook::test_ops(OSDService *service, ObjectStore *store, ss << "ok"; } else if (command == "rmomapkey") { string key; - cmd_getval(service->cct, cmdmap, "key", key); + cmd_getval(cmdmap, "key", key); t.omap_rmkey(coll_t(pgid), ghobject_t(obj), key); r = store->queue_transaction(service->meta_ch, std::move(t)); @@ -6013,7 +6013,7 @@ void TestOpsSocketHook::test_ops(OSDService *service, ObjectStore *store, bufferlist newheader; string headerstr; - cmd_getval(service->cct, cmdmap, "header", headerstr); + cmd_getval(cmdmap, "header", headerstr); newheader.append(headerstr); t.omap_setheader(coll_t(pgid), ghobject_t(obj), newheader); r = store->queue_transaction(service->meta_ch, std::move(t)); @@ -6043,7 +6043,7 @@ void TestOpsSocketHook::test_ops(OSDService *service, ObjectStore *store, } } else if (command == "truncobj") { int64_t trunclen; - cmd_getval(service->cct, cmdmap, "len", trunclen); + cmd_getval(cmdmap, "len", trunclen); t.truncate(coll_t(pgid), ghobject_t(obj), trunclen); r = store->queue_transaction(service->meta_ch, std::move(t)); if (r < 0) @@ -6061,7 +6061,7 @@ void TestOpsSocketHook::test_ops(OSDService *service, ObjectStore *store, } if (command == "set_recovery_delay") { int64_t delay; - cmd_getval(service->cct, cmdmap, "utime", delay, (int64_t)0); + cmd_getval(cmdmap, "utime", delay, (int64_t)0); ostringstream oss; oss << delay; int r = service->cct->_conf.set_val("osd_recovery_delay_start", @@ -6081,8 +6081,8 @@ void TestOpsSocketHook::test_ops(OSDService *service, ObjectStore *store, int64_t count; string type; OSDService::s_names state; - cmd_getval(service->cct, cmdmap, "type", type, string("full")); - cmd_getval(service->cct, cmdmap, "count", count, (int64_t)-1); + cmd_getval(cmdmap, "type", type, string("full")); + cmd_getval(cmdmap, "count", count, (int64_t)-1); if (type == "none" || count == 0) { type = "none"; count = 0; @@ -10752,7 +10752,7 @@ int heap(CephContext& cct, const cmdmap_t& cmdmap, Formatter& f, } string cmd; - if (!cmd_getval(&cct, cmdmap, "heapcmd", cmd)) { + if (!cmd_getval(cmdmap, "heapcmd", cmd)) { os << "unable to get value for command \"" << cmd << "\""; return -EINVAL; } @@ -10761,7 +10761,7 @@ int heap(CephContext& cct, const cmdmap_t& cmdmap, Formatter& f, get_str_vec(cmd, cmd_vec); string val; - if (cmd_getval(&cct, cmdmap, "value", val)) { + if (cmd_getval(cmdmap, "value", val)) { cmd_vec.push_back(val); } diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 7cd9a5ce4b6e3..f7a465b9c187d 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -956,7 +956,7 @@ void PrimaryLogPG::do_command( std::function on_finish) { string format; - cmd_getval(cct, cmdmap, "format", format); + cmd_getval(cmdmap, "format", format); std::unique_ptr f(Formatter::create( format, "json-pretty", "json-pretty")); int ret = 0; @@ -968,7 +968,7 @@ void PrimaryLogPG::do_command( // - ceph tell foo -> prefix=foo string prefix(orig_prefix); string command; - cmd_getval(cct, cmdmap, "cmd", command); + cmd_getval(cmdmap, "cmd", command); if (command.size()) { prefix = command; } @@ -994,7 +994,7 @@ void PrimaryLogPG::do_command( else if (prefix == "mark_unfound_lost") { string mulcmd; - cmd_getval(cct, cmdmap, "mulcmd", mulcmd); + cmd_getval(cmdmap, "mulcmd", mulcmd); int mode = -1; if (mulcmd == "revert") { if (pool.info.is_erasure()) { @@ -1040,7 +1040,7 @@ void PrimaryLogPG::do_command( hobject_t offset; string offset_json; bool show_offset = false; - if (cmd_getval(cct, cmdmap, "offset", offset_json)) { + if (cmd_getval(cmdmap, "offset", offset_json)) { json_spirit::Value v; try { if (!json_spirit::read(offset_json, v)) @@ -1101,7 +1101,7 @@ void PrimaryLogPG::do_command( prefix == "deep_scrub") { bool deep = (prefix == "deep_scrub"); int64_t time; - cmd_getval(cct, cmdmap, "time", time, (int64_t)0); + cmd_getval(cmdmap, "time", time, (int64_t)0); if (is_primary()) { const pg_pool_t *p = &pool.info; diff --git a/src/test/admin_socket.cc b/src/test/admin_socket.cc index 36e6f3e7cf908..fb0a9d2992779 100644 --- a/src/test/admin_socket.cc +++ b/src/test/admin_socket.cc @@ -120,7 +120,7 @@ class MyTest : public AdminSocketHook { std::ostream& ss, bufferlist& result) override { std::vector args; - cmd_getval(g_ceph_context, cmdmap, "args", args); + cmd_getval(cmdmap, "args", args); result.append(command); result.append("|"); string resultstr; @@ -155,7 +155,7 @@ class MyTest2 : public AdminSocketHook { std::ostream& ss, bufferlist& result) override { std::vector args; - cmd_getval(g_ceph_context, cmdmap, "args", args); + cmd_getval(cmdmap, "args", args); result.append(command); result.append("|"); string resultstr; -- 2.39.5