}
string prefix;
- cmd_getval_throws(cct, cmdmap, "prefix", prefix);
+ cmd_getval(cct, cmdmap, "prefix", prefix);
string format;
- cmd_getval_throws(cct, cmdmap, "format", format, string("plain"));
+ cmd_getval(cct, cmdmap, "format", format, string("plain"));
boost::scoped_ptr<Formatter> f(Formatter::create(format));
if (prefix == "osd stat") {
epoch_t epoch = 0;
int64_t epochnum;
- cmd_getval_throws(cct, cmdmap, "epoch", epochnum, (int64_t)osdmap.get_epoch());
+ cmd_getval(cct, cmdmap, "epoch", epochnum, (int64_t)osdmap.get_epoch());
epoch = epochnum;
bufferlist osdmap_bl;
} else if (prefix == "osd tree" || prefix == "osd tree-from") {
string bucket;
if (prefix == "osd tree-from") {
- cmd_getval_throws(cct, cmdmap, "bucket", bucket);
+ cmd_getval(cct, cmdmap, "bucket", bucket);
if (!osdmap.crush->name_exists(bucket)) {
ss << "bucket '" << bucket << "' does not exist";
r = -ENOENT;
}
vector<string> states;
- cmd_getval_throws(cct, cmdmap, "states", states);
+ cmd_getval(cct, cmdmap, "states", states);
unsigned filter = 0;
for (auto& s : states) {
if (s == "up") {
ss << p->get_crush_version();
} else if (prefix == "osd ls-tree") {
string bucket_name;
- cmd_getval_throws(cct, cmdmap, "name", bucket_name);
+ cmd_getval(cct, cmdmap, "name", bucket_name);
set<int> osds;
r = p->get_osds_by_bucket_name(bucket_name, &osds);
if (r == -ENOENT) {
goto reply;
} else if (prefix == "osd find") {
int64_t osd;
- if (!cmd_getval_throws(cct, cmdmap, "id", osd)) {
+ if (!cmd_getval(cct, cmdmap, "id", osd)) {
ss << "unable to parse osd id value '"
<< cmd_vartype_stringify(cmdmap["id"]) << "'";
r = -EINVAL;
goto reply;
}
string format;
- cmd_getval_throws(cct, cmdmap, "format", format);
+ cmd_getval(cct, cmdmap, "format", format);
boost::scoped_ptr<Formatter> f(Formatter::create(format, "json-pretty", "json-pretty"));
f->open_object_section("osd_location");
f->dump_int("osd", osd);
} else if (prefix == "osd metadata") {
int64_t osd = -1;
if (cmd_vartype_stringify(cmdmap["id"]).size() &&
- !cmd_getval_throws(cct, cmdmap, "id", osd)) {
+ !cmd_getval(cct, cmdmap, "id", osd)) {
ss << "unable to parse osd id value '"
<< cmd_vartype_stringify(cmdmap["id"]) << "'";
r = -EINVAL;
goto reply;
}
string format;
- cmd_getval_throws(cct, cmdmap, "format", format);
+ cmd_getval(cct, cmdmap, "format", format);
boost::scoped_ptr<Formatter> f(Formatter::create(format, "json-pretty", "json-pretty"));
if (osd >= 0) {
f->open_object_section("osd_metadata");
if (!f)
f.reset(Formatter::create("json-pretty"));
string field;
- cmd_getval_throws(cct, cmdmap, "property", field);
+ cmd_getval(cct, cmdmap, "property", field);
count_metadata(field, f.get());
f->flush(rdata);
r = 0;
} else if (prefix == "osd map") {
string poolstr, objstr, namespacestr;
- cmd_getval_throws(cct, cmdmap, "pool", poolstr);
- cmd_getval_throws(cct, cmdmap, "object", objstr);
- cmd_getval_throws(cct, cmdmap, "nspace", namespacestr);
+ cmd_getval(cct, cmdmap, "pool", poolstr);
+ cmd_getval(cct, cmdmap, "object", objstr);
+ cmd_getval(cct, cmdmap, "nspace", namespacestr);
int64_t pool = osdmap.lookup_pg_pool_name(poolstr.c_str());
if (pool < 0) {
} else if (prefix == "pg map") {
pg_t pgid;
string pgidstr;
- cmd_getval_throws(cct, cmdmap, "pgid", pgidstr);
+ cmd_getval(cct, cmdmap, "pgid", pgidstr);
if (!pgid.parse(pgidstr.c_str())) {
ss << "invalid pgid '" << pgidstr << "'";
r = -EINVAL;
} else if (prefix == "osd pool ls") {
string detail;
- cmd_getval_throws(cct, cmdmap, "detail", detail);
+ cmd_getval(cct, cmdmap, "detail", detail);
if (!f && detail == "detail") {
ostringstream ss;
osdmap.print_pools(ss);
} else if (prefix == "osd crush get-tunable") {
string tunable;
- cmd_getval_throws(cct, cmdmap, "tunable", tunable);
+ cmd_getval(cct, cmdmap, "tunable", tunable);
ostringstream rss;
if (f)
f->open_object_section("tunable");
} else if (prefix == "osd pool get") {
string poolstr;
- cmd_getval_throws(cct, cmdmap, "pool", poolstr);
+ cmd_getval(cct, cmdmap, "pool", poolstr);
int64_t pool = osdmap.lookup_pg_pool_name(poolstr.c_str());
if (pool < 0) {
ss << "unrecognized pool '" << poolstr << "'";
const pg_pool_t *p = osdmap.get_pg_pool(pool);
string var;
- cmd_getval_throws(cct, cmdmap, "var", var);
+ cmd_getval(cct, cmdmap, "var", var);
typedef std::map<std::string, osd_pool_get_choices> choices_map_t;
const choices_map_t ALL_CHOICES = {
r = 0;
} else if (prefix == "osd pool get-quota") {
string pool_name;
- cmd_getval_throws(cct, cmdmap, "pool", pool_name);
+ cmd_getval(cct, cmdmap, "pool", pool_name);
int64_t poolid = osdmap.lookup_pg_pool_name(pool_name);
if (poolid < 0) {
}
} else if (prefix == "osd crush rule ls-by-class") {
string class_name;
- cmd_getval_throws(cct, cmdmap, "class", class_name);
+ cmd_getval(cct, cmdmap, "class", class_name);
if (class_name.empty()) {
ss << "no class specified";
r = -EINVAL;
}
} else if (prefix == "osd crush rule dump") {
string name;
- cmd_getval_throws(cct, cmdmap, "name", name);
+ cmd_getval(cct, cmdmap, "name", name);
string format;
- cmd_getval_throws(cct, cmdmap, "format", format);
+ cmd_getval(cct, cmdmap, "format", format);
boost::scoped_ptr<Formatter> f(Formatter::create(format, "json-pretty", "json-pretty"));
if (name == "") {
f->open_array_section("rules");
rdata.append(rs.str());
} else if (prefix == "osd crush dump") {
string format;
- cmd_getval_throws(cct, cmdmap, "format", format);
+ cmd_getval(cct, cmdmap, "format", format);
boost::scoped_ptr<Formatter> f(Formatter::create(format, "json-pretty", "json-pretty"));
f->open_object_section("crush_map");
osdmap.crush->dump(f.get());
rdata.append(rs.str());
} else if (prefix == "osd crush show-tunables") {
string format;
- cmd_getval_throws(cct, cmdmap, "format", format);
+ cmd_getval(cct, cmdmap, "format", format);
boost::scoped_ptr<Formatter> f(Formatter::create(format, "json-pretty", "json-pretty"));
f->open_object_section("crush_map_tunables");
osdmap.crush->dump_tunables(f.get());
rdata.append(rs.str());
} else if (prefix == "osd crush tree") {
string shadow;
- cmd_getval_throws(cct, cmdmap, "shadow", shadow);
+ cmd_getval(cct, cmdmap, "shadow", shadow);
bool show_shadow = shadow == "--show-shadow";
boost::scoped_ptr<Formatter> f(Formatter::create(format));
if (f) {
}
} else if (prefix == "osd crush ls") {
string name;
- if (!cmd_getval_throws(cct, cmdmap, "node", name)) {
+ if (!cmd_getval(cct, cmdmap, "node", name)) {
ss << "no node specified";
r = -EINVAL;
goto reply;
f->flush(rdata);
} else if (prefix == "osd crush class ls-osd") {
string name;
- cmd_getval_throws(cct, cmdmap, "class", name);
+ cmd_getval(cct, cmdmap, "class", name);
set<int> osds;
osdmap.crush->get_devices_by_class(name, &osds);
if (f) {
f->flush(rdata);
} else if (prefix == "osd erasure-code-profile get") {
string name;
- cmd_getval_throws(cct, cmdmap, "name", name);
+ cmd_getval(cct, cmdmap, "name", name);
if (!osdmap.has_erasure_code_profile(name)) {
ss << "unknown erasure code profile '" << name << "'";
r = -ENOENT;
boost::scoped_ptr<Formatter> f(Formatter::create(format, "json-pretty",
"json-pretty"));
string pool_name;
- cmd_getval_throws(cct, cmdmap, "pool", pool_name);
+ cmd_getval(cct, cmdmap, "pool", pool_name);
string app;
- cmd_getval_throws(cct, cmdmap, "app", app);
+ cmd_getval(cct, cmdmap, "app", app);
string key;
- cmd_getval_throws(cct, cmdmap, "key", key);
+ cmd_getval(cct, cmdmap, "key", key);
if (pool_name.empty()) {
// all
stringstream& ss)
{
string poolstr;
- cmd_getval_throws(cct, cmdmap, "pool", poolstr);
+ cmd_getval(cct, 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_throws(cct, cmdmap, "var", var);
+ cmd_getval(cct, cmdmap, "var", var);
pg_pool_t p = *osdmap.get_pg_pool(pool);
if (pending_inc.new_pools.count(pool))
return r;
}
string force;
- cmd_getval_throws(cct,cmdmap, "force", force);
+ cmd_getval(cct,cmdmap, "force", force);
if (p.cache_mode != pg_pool_t::CACHEMODE_NONE &&
force != "--yes-i-really-mean-it") {
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.";
} else if (var == "hashpspool") {
uint64_t flag = pg_pool_t::get_flag_by_name(var);
string force;
- cmd_getval_throws(cct, cmdmap, "force", force);
+ cmd_getval(cct, cmdmap, "force", force);
if (force != "--yes-i-really-mean-it") {
ss << "are you SURE? this will remap all placement groups in this pool,"
" this triggers large data movement,"
stringstream& ss)
{
string pool_name;
- cmd_getval_throws(cct, cmdmap, "pool", pool_name);
+ cmd_getval(cct, cmdmap, "pool", pool_name);
int64_t pool = osdmap.lookup_pg_pool_name(pool_name.c_str());
if (pool < 0) {
ss << "unrecognized pool '" << pool_name << "'";
}
string app;
- cmd_getval_throws(cct, cmdmap, "app", app);
+ cmd_getval(cct, cmdmap, "app", app);
bool app_exists = (p.application_metadata.count(app) > 0);
string key;
- cmd_getval_throws(cct, cmdmap, "key", key);
+ cmd_getval(cct, cmdmap, "key", key);
if (key == "all") {
ss << "key cannot be 'all'";
return -EINVAL;
}
string value;
- cmd_getval_throws(cct, cmdmap, "value", value);
+ cmd_getval(cct, cmdmap, "value", value);
if (value == "all") {
ss << "value cannot be 'all'";
return -EINVAL;
}
string force;
- cmd_getval_throws(cct, cmdmap, "force", force);
+ cmd_getval(cct, cmdmap, "force", force);
if (!app_exists && !p.application_metadata.empty() &&
force != "--yes-i-really-mean-it") {
} else if (boost::algorithm::ends_with(prefix, "disable")) {
string force;
- cmd_getval_throws(cct, cmdmap, "force", force);
+ cmd_getval(cct, cmdmap, "force", force);
if (force != "--yes-i-really-mean-it") {
ss << "Are you SURE? Disabling an application within a pool might result "
}
string key;
- cmd_getval_throws(cct, cmdmap, "key", key);
+ cmd_getval(cct, cmdmap, "key", key);
if (key.empty()) {
ss << "key must be provided";
}
string value;
- cmd_getval_throws(cct, cmdmap, "value", value);
+ cmd_getval(cct, cmdmap, "value", value);
if (value.length() > MAX_POOL_APPLICATION_LENGTH) {
ss << "value '" << value << "' too long; max length "
<< MAX_POOL_APPLICATION_LENGTH;
}
string key;
- cmd_getval_throws(cct, cmdmap, "key", key);
+ cmd_getval(cct, 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
* If `id` is specified, and the osd has been previously marked
* as destroyed, then the `id` will be reused.
*/
- if (!cmd_getval_throws(cct, cmdmap, "uuid", uuidstr)) {
+ if (!cmd_getval(cct, cmdmap, "uuid", uuidstr)) {
ss << "requires the OSD's UUID to be specified.";
return -EINVAL;
} else if (!uuid.parse(uuidstr.c_str())) {
return -EINVAL;
}
- if (cmd_getval_throws(cct, cmdmap, "id", id) &&
+ if (cmd_getval(cct, cmdmap, "id", id) &&
(id < 0)) {
ss << "invalid OSD id; must be greater or equal than zero.";
return -EINVAL;
map<int32_t, uint32_t>* weights)
{
string weights_str;
- if (!cmd_getval_throws(cct, cmdmap, "weights", weights_str)) {
+ if (!cmd_getval(cct, cmdmap, "weights", weights_str)) {
return -EINVAL;
}
std::replace(begin(weights_str), end(weights_str), '\'', '"');
int err = 0;
string format;
- cmd_getval_throws(cct, cmdmap, "format", format, string("plain"));
+ cmd_getval(cct, cmdmap, "format", format, string("plain"));
boost::scoped_ptr<Formatter> f(Formatter::create(format));
string prefix;
- cmd_getval_throws(cct, cmdmap, "prefix", prefix);
+ cmd_getval(cct, cmdmap, "prefix", prefix);
int64_t osdid;
string osd_name;
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_throws(cct, cmdmap, "id", osdid);
+ osdid_present = cmd_getval(cct, cmdmap, "id", osdid);
}
if (osdid_present) {
ostringstream oss;
}
int64_t prior_version = 0;
- if (cmd_getval_throws(cct, cmdmap, "prior_version", prior_version)) {
+ if (cmd_getval(cct, 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)
return true;
} else if (prefix == "osd crush set-device-class") {
string device_class;
- if (!cmd_getval_throws(cct, cmdmap, "class", device_class)) {
+ if (!cmd_getval(cct, cmdmap, "class", device_class)) {
err = -EINVAL; // no value!
goto reply;
}
bool stop = false;
vector<string> idvec;
- cmd_getval_throws(cct, cmdmap, "ids", idvec);
+ cmd_getval(cct, cmdmap, "ids", idvec);
CrushWrapper newcrush;
_get_pending_crush(newcrush);
set<int> updated;
} else if (prefix == "osd crush rm-device-class") {
bool stop = false;
vector<string> idvec;
- cmd_getval_throws(cct, cmdmap, "ids", idvec);
+ cmd_getval(cct, cmdmap, "ids", idvec);
CrushWrapper newcrush;
_get_pending_crush(newcrush);
set<int> updated;
}
} else if (prefix == "osd crush class rename") {
string srcname, dstname;
- if (!cmd_getval_throws(cct, cmdmap, "srcname", srcname)) {
+ if (!cmd_getval(cct, cmdmap, "srcname", srcname)) {
err = -EINVAL;
goto reply;
}
- if (!cmd_getval_throws(cct, cmdmap, "dstname", dstname)) {
+ if (!cmd_getval(cct, cmdmap, "dstname", dstname)) {
err = -EINVAL;
goto reply;
}
// os crush add-bucket <name> <type>
string name, typestr;
vector<string> argvec;
- cmd_getval_throws(cct, cmdmap, "name", name);
- cmd_getval_throws(cct, cmdmap, "type", typestr);
- cmd_getval_throws(cct, cmdmap, "args", argvec);
+ cmd_getval(cct, cmdmap, "name", name);
+ cmd_getval(cct, cmdmap, "type", typestr);
+ cmd_getval(cct, cmdmap, "args", argvec);
map<string,string> loc;
if (!argvec.empty()) {
CrushWrapper::parse_loc_map(argvec, &loc);
goto update;
} else if (prefix == "osd crush rename-bucket") {
string srcname, dstname;
- cmd_getval_throws(cct, cmdmap, "srcname", srcname);
- cmd_getval_throws(cct, cmdmap, "dstname", dstname);
+ cmd_getval(cct, cmdmap, "srcname", srcname);
+ cmd_getval(cct, cmdmap, "dstname", dstname);
err = crush_rename_bucket(srcname, dstname, &ss);
if (err == -EALREADY) // equivalent to success for idempotency
goto reply;
}
string poolname, mode;
- cmd_getval_throws(cct, cmdmap, "pool", poolname);
+ cmd_getval(cct, 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_throws(cct, cmdmap, "mode", mode);
+ cmd_getval(cct, cmdmap, "mode", mode);
if (mode != "flat" && mode != "positional") {
ss << "unrecognized weight-set mode '" << mode << "'";
err = -EINVAL;
int64_t pool;
if (prefix == "osd crush weight-set rm") {
string poolname;
- cmd_getval_throws(cct, cmdmap, "pool", poolname);
+ cmd_getval(cct, cmdmap, "pool", poolname);
pool = osdmap.lookup_pg_pool_name(poolname.c_str());
if (pool < 0) {
ss << "pool '" << poolname << "' not found";
prefix == "osd crush weight-set reweight-compat") {
string poolname, item;
vector<double> weight;
- cmd_getval_throws(cct, cmdmap, "pool", poolname);
- cmd_getval_throws(cct, cmdmap, "item", item);
- cmd_getval_throws(cct, cmdmap, "weight", weight);
+ cmd_getval(cct, cmdmap, "pool", poolname);
+ cmd_getval(cct, cmdmap, "item", item);
+ cmd_getval(cct, cmdmap, "weight", weight);
CrushWrapper newcrush;
_get_pending_crush(newcrush);
int64_t pool;
}
double weight;
- if (!cmd_getval_throws(cct, cmdmap, "weight", weight)) {
+ if (!cmd_getval(cct, cmdmap, "weight", weight)) {
ss << "unable to parse weight value '"
<< cmd_vartype_stringify(cmdmap.at("weight")) << "'";
err = -EINVAL;
string args;
vector<string> argvec;
- cmd_getval_throws(cct, cmdmap, "args", argvec);
+ cmd_getval(cct, cmdmap, "args", argvec);
map<string,string> loc;
CrushWrapper::parse_loc_map(argvec, &loc);
}
double weight;
- if (!cmd_getval_throws(cct, cmdmap, "weight", weight)) {
+ if (!cmd_getval(cct, cmdmap, "weight", weight)) {
ss << "unable to parse weight value '"
<< cmd_vartype_stringify(cmdmap.at("weight")) << "'";
err = -EINVAL;
string args;
vector<string> argvec;
- cmd_getval_throws(cct, cmdmap, "args", argvec);
+ cmd_getval(cct, cmdmap, "args", argvec);
map<string,string> loc;
CrushWrapper::parse_loc_map(argvec, &loc);
// osd crush move <name> <loc1> [<loc2> ...]
string name;
vector<string> argvec;
- cmd_getval_throws(cct, cmdmap, "name", name);
- cmd_getval_throws(cct, cmdmap, "args", argvec);
+ cmd_getval(cct, cmdmap, "name", name);
+ cmd_getval(cct, cmdmap, "args", argvec);
map<string,string> loc;
CrushWrapper::parse_loc_map(argvec, &loc);
} while (false);
} else if (prefix == "osd crush swap-bucket") {
string source, dest, force;
- cmd_getval_throws(cct, cmdmap, "source", source);
- cmd_getval_throws(cct, cmdmap, "dest", dest);
- cmd_getval_throws(cct, cmdmap, "force", force);
+ cmd_getval(cct, cmdmap, "source", source);
+ cmd_getval(cct, cmdmap, "dest", dest);
+ cmd_getval(cct, cmdmap, "force", force);
CrushWrapper newcrush;
_get_pending_crush(newcrush);
if (!newcrush.name_exists(source)) {
} else if (prefix == "osd crush link") {
// osd crush link <name> <loc1> [<loc2> ...]
string name;
- cmd_getval_throws(cct, cmdmap, "name", name);
+ cmd_getval(cct, cmdmap, "name", name);
vector<string> argvec;
- cmd_getval_throws(cct, cmdmap, "args", argvec);
+ cmd_getval(cct, cmdmap, "args", argvec);
map<string,string> loc;
CrushWrapper::parse_loc_map(argvec, &loc);
_get_pending_crush(newcrush);
string name;
- cmd_getval_throws(cct, cmdmap, "name", name);
+ cmd_getval(cct, cmdmap, "name", name);
if (!osdmap.crush->name_exists(name)) {
err = 0;
bool unlink_only = prefix == "osd crush unlink";
string ancestor_str;
- if (cmd_getval_throws(cct, cmdmap, "ancestor", ancestor_str)) {
+ if (cmd_getval(cct, cmdmap, "ancestor", ancestor_str)) {
if (!newcrush.name_exists(ancestor_str)) {
err = -ENOENT;
ss << "ancestor item '" << ancestor_str
_get_pending_crush(newcrush);
string name;
- cmd_getval_throws(cct, cmdmap, "name", name);
+ cmd_getval(cct, cmdmap, "name", name);
if (!newcrush.name_exists(name)) {
err = -ENOENT;
ss << "device '" << name << "' does not appear in the crush map";
goto reply;
}
double w;
- if (!cmd_getval_throws(cct, cmdmap, "weight", w)) {
+ if (!cmd_getval(cct, cmdmap, "weight", w)) {
ss << "unable to parse weight value '"
<< cmd_vartype_stringify(cmdmap.at("weight")) << "'";
err = -EINVAL;
_get_pending_crush(newcrush);
string name;
- cmd_getval_throws(cct, cmdmap, "name", name);
+ cmd_getval(cct, cmdmap, "name", name);
if (!newcrush.name_exists(name)) {
err = -ENOENT;
ss << "device '" << name << "' does not appear in the crush map";
goto reply;
}
double w;
- if (!cmd_getval_throws(cct, cmdmap, "weight", w)) {
+ if (!cmd_getval(cct, cmdmap, "weight", w)) {
ss << "unable to parse weight value '"
<< cmd_vartype_stringify(cmdmap.at("weight")) << "'";
err = -EINVAL;
err = 0;
string profile;
- cmd_getval_throws(cct, cmdmap, "profile", profile);
+ cmd_getval(cct, cmdmap, "profile", profile);
if (profile == "legacy" || profile == "argonaut") {
newcrush.set_tunables_legacy();
} else if (profile == "bobtail") {
err = 0;
string tunable;
- cmd_getval_throws(cct, cmdmap, "tunable", tunable);
+ cmd_getval(cct, cmdmap, "tunable", tunable);
int64_t value = -1;
- if (!cmd_getval_throws(cct, cmdmap, "value", value)) {
+ if (!cmd_getval(cct, cmdmap, "value", value)) {
err = -EINVAL;
ss << "failed to parse integer value "
<< cmd_vartype_stringify(cmdmap.at("value"));
} else if (prefix == "osd crush rule create-simple") {
string name, root, type, mode;
- cmd_getval_throws(cct, cmdmap, "name", name);
- cmd_getval_throws(cct, cmdmap, "root", root);
- cmd_getval_throws(cct, cmdmap, "type", type);
- cmd_getval_throws(cct, cmdmap, "mode", 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);
if (mode == "")
mode = "firstn";
} else if (prefix == "osd crush rule create-replicated") {
string name, root, type, device_class;
- cmd_getval_throws(cct, cmdmap, "name", name);
- cmd_getval_throws(cct, cmdmap, "root", root);
- cmd_getval_throws(cct, cmdmap, "type", type);
- cmd_getval_throws(cct, cmdmap, "class", 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);
if (osdmap.crush->rule_exists(name)) {
// The name is uniquely associated to a ruleid and the rule it contains
} else if (prefix == "osd erasure-code-profile rm") {
string name;
- cmd_getval_throws(cct, cmdmap, "name", name);
+ cmd_getval(cct, cmdmap, "name", name);
if (erasure_code_profile_in_use(pending_inc.new_pools, name, &ss))
goto wait;
} else if (prefix == "osd erasure-code-profile set") {
string name;
- cmd_getval_throws(cct, cmdmap, "name", name);
+ cmd_getval(cct, cmdmap, "name", name);
vector<string> profile;
- cmd_getval_throws(cct, cmdmap, "profile", profile);
+ cmd_getval(cct, cmdmap, "profile", profile);
bool force;
if (profile.size() > 0 && profile.back() == "--force") {
profile.pop_back();
if (err)
goto reply;
string name, poolstr;
- cmd_getval_throws(cct, cmdmap, "name", name);
+ cmd_getval(cct, cmdmap, "name", name);
string profile;
- cmd_getval_throws(cct, cmdmap, "profile", profile);
+ cmd_getval(cct, cmdmap, "profile", profile);
if (profile == "")
profile = "default";
if (profile == "default") {
} else if (prefix == "osd crush rule rm") {
string name;
- cmd_getval_throws(cct, cmdmap, "name", name);
+ cmd_getval(cct, cmdmap, "name", name);
if (!osdmap.crush->rule_exists(name)) {
ss << "rule " << name << " does not exist";
} else if (prefix == "osd crush rule rename") {
string srcname;
string dstname;
- cmd_getval_throws(cct, cmdmap, "srcname", srcname);
- cmd_getval_throws(cct, cmdmap, "dstname", dstname);
+ cmd_getval(cct, cmdmap, "srcname", srcname);
+ cmd_getval(cct, cmdmap, "dstname", dstname);
if (srcname.empty() || dstname.empty()) {
ss << "must specify both source rule name and destination rule name";
err = -EINVAL;
} else if (prefix == "osd setmaxosd") {
int64_t newmax;
- if (!cmd_getval_throws(cct, cmdmap, "newmax", newmax)) {
+ if (!cmd_getval(cct, cmdmap, "newmax", newmax)) {
ss << "unable to parse 'newmax' value '"
<< cmd_vartype_stringify(cmdmap.at("newmax")) << "'";
err = -EINVAL;
prefix == "osd set-backfillfull-ratio" ||
prefix == "osd set-nearfull-ratio") {
double n;
- if (!cmd_getval_throws(cct, cmdmap, "ratio", n)) {
+ if (!cmd_getval(cct, cmdmap, "ratio", n)) {
ss << "unable to parse 'ratio' value '"
<< cmd_vartype_stringify(cmdmap.at("ratio")) << "'";
err = -EINVAL;
return true;
} else if (prefix == "osd set-require-min-compat-client") {
string v;
- cmd_getval_throws(cct, cmdmap, "version", v);
+ cmd_getval(cct, cmdmap, "version", v);
int vno = ceph_release_from_name(v.c_str());
if (vno <= 0) {
ss << "version " << v << " is not recognized";
goto reply;
}
string sure;
- cmd_getval_throws(cct, cmdmap, "sure", sure);
+ cmd_getval(cct, cmdmap, "sure", sure);
if (sure != "--yes-i-really-mean-it") {
FeatureMap m;
mon->get_combined_feature_map(&m);
} else if (prefix == "osd set") {
string sure;
- cmd_getval_throws(cct, cmdmap, "sure", sure);
+ cmd_getval(cct, cmdmap, "sure", sure);
string key;
- cmd_getval_throws(cct, cmdmap, "key", key);
+ cmd_getval(cct, cmdmap, "key", key);
if (key == "full")
return prepare_set_flag(op, CEPH_OSDMAP_FULL);
else if (key == "pause")
} else if (prefix == "osd unset") {
string key;
- cmd_getval_throws(cct, cmdmap, "key", key);
+ cmd_getval(cct, cmdmap, "key", key);
if (key == "full")
return prepare_unset_flag(op, CEPH_OSDMAP_FULL);
else if (key == "pause")
} else if (prefix == "osd require-osd-release") {
string release;
- cmd_getval_throws(cct, cmdmap, "release", release);
+ cmd_getval(cct, cmdmap, "release", release);
string sure;
- cmd_getval_throws(cct, cmdmap, "sure", sure);
+ cmd_getval(cct, cmdmap, "sure", sure);
if (!osdmap.test_flag(CEPH_OSDMAP_SORTBITWISE)) {
ss << "the sortbitwise flag must be set first";
err = -EPERM;
bool verbose = true;
vector<string> idvec;
- cmd_getval_throws(cct, cmdmap, "ids", idvec);
+ cmd_getval(cct, cmdmap, "ids", idvec);
for (unsigned j = 0; j < idvec.size() && !stop; j++) {
set<int> osds;
bool stop = false;
vector<string> idvec;
- cmd_getval_throws(cct, cmdmap, "ids", idvec);
+ cmd_getval(cct, cmdmap, "ids", idvec);
for (unsigned j = 0; j < idvec.size() && !stop; j++) {
set<int> osds;
bool stop = false;
vector<string> idvec;
- cmd_getval_throws(cct, cmdmap, "ids", idvec);
+ cmd_getval(cct, cmdmap, "ids", idvec);
for (unsigned j = 0; j < idvec.size() && !stop; j++) {
}
} else if (prefix == "osd pg-temp") {
string pgidstr;
- if (!cmd_getval_throws(cct, cmdmap, "pgid", pgidstr)) {
+ if (!cmd_getval(cct, cmdmap, "pgid", pgidstr)) {
ss << "unable to parse 'pgid' value '"
<< cmd_vartype_stringify(cmdmap.at("pgid")) << "'";
err = -EINVAL;
vector<int64_t> id_vec;
vector<int32_t> new_pg_temp;
- cmd_getval_throws(cct, cmdmap, "id", id_vec);
+ cmd_getval(cct, cmdmap, "id", id_vec);
if (id_vec.empty()) {
pending_inc.new_pg_temp[pgid] = mempool::osdmap::vector<int>();
ss << "done cleaning up pg_temp of " << pgid;
goto update;
} else if (prefix == "osd primary-temp") {
string pgidstr;
- if (!cmd_getval_throws(cct, cmdmap, "pgid", pgidstr)) {
+ if (!cmd_getval(cct, cmdmap, "pgid", pgidstr)) {
ss << "unable to parse 'pgid' value '"
<< cmd_vartype_stringify(cmdmap.at("pgid")) << "'";
err = -EINVAL;
}
int64_t osd;
- if (!cmd_getval_throws(cct, cmdmap, "id", osd)) {
+ if (!cmd_getval(cct, cmdmap, "id", osd)) {
ss << "unable to parse 'id' value '"
<< cmd_vartype_stringify(cmdmap.at("id")) << "'";
err = -EINVAL;
} else if (prefix == "pg repeer") {
pg_t pgid;
string pgidstr;
- cmd_getval_throws(cct, cmdmap, "pgid", pgidstr);
+ cmd_getval(cct, cmdmap, "pgid", pgidstr);
if (!pgid.parse(pgidstr.c_str())) {
ss << "invalid pgid '" << pgidstr << "'";
err = -EINVAL;
if (err < 0)
goto reply;
string pgidstr;
- if (!cmd_getval_throws(cct, cmdmap, "pgid", pgidstr)) {
+ if (!cmd_getval(cct, cmdmap, "pgid", pgidstr)) {
ss << "unable to parse 'pgid' value '"
<< cmd_vartype_stringify(cmdmap.at("pgid")) << "'";
err = -EINVAL;
case OP_PG_UPMAP:
{
vector<int64_t> id_vec;
- if (!cmd_getval_throws(cct, cmdmap, "id", id_vec)) {
+ if (!cmd_getval(cct, cmdmap, "id", id_vec)) {
ss << "unable to parse 'id' value(s) '"
<< cmd_vartype_stringify(cmdmap.at("id")) << "'";
err = -EINVAL;
case OP_PG_UPMAP_ITEMS:
{
vector<int64_t> id_vec;
- if (!cmd_getval_throws(cct, cmdmap, "id", id_vec)) {
+ if (!cmd_getval(cct, cmdmap, "id", id_vec)) {
ss << "unable to parse 'id' value(s) '"
<< cmd_vartype_stringify(cmdmap.at("id")) << "'";
err = -EINVAL;
goto update;
} else if (prefix == "osd primary-affinity") {
int64_t id;
- if (!cmd_getval_throws(cct, cmdmap, "id", id)) {
+ if (!cmd_getval(cct, cmdmap, "id", id)) {
ss << "invalid osd id value '"
<< cmd_vartype_stringify(cmdmap.at("id")) << "'";
err = -EINVAL;
goto reply;
}
double w;
- if (!cmd_getval_throws(cct, cmdmap, "weight", w)) {
+ if (!cmd_getval(cct, cmdmap, "weight", w)) {
ss << "unable to parse 'weight' value '"
<< cmd_vartype_stringify(cmdmap.at("weight")) << "'";
err = -EINVAL;
}
} else if (prefix == "osd reweight") {
int64_t id;
- if (!cmd_getval_throws(cct, cmdmap, "id", id)) {
+ if (!cmd_getval(cct, 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_throws(cct, cmdmap, "weight", w)) {
+ if (!cmd_getval(cct, cmdmap, "weight", w)) {
ss << "unable to parse weight value '"
<< cmd_vartype_stringify(cmdmap.at("weight")) << "'";
err = -EINVAL;
return true;
} else if (prefix == "osd lost") {
int64_t id;
- if (!cmd_getval_throws(cct, cmdmap, "id", id)) {
+ if (!cmd_getval(cct, cmdmap, "id", id)) {
ss << "unable to parse osd id value '"
<< cmd_vartype_stringify(cmdmap.at("id")) << "'";
err = -EINVAL;
goto reply;
}
string sure;
- if (!cmd_getval_throws(cct, cmdmap, "sure", sure) || sure != "--yes-i-really-mean-it") {
+ if (!cmd_getval(cct, cmdmap, "sure", sure) || sure != "--yes-i-really-mean-it") {
ss << "are you SURE? this might mean real, permanent data loss. pass "
"--yes-i-really-mean-it if you really do.";
err = -EPERM;
}
int64_t id;
- if (!cmd_getval_throws(cct, cmdmap, "id", id)) {
+ if (!cmd_getval(cct, cmdmap, "id", id)) {
auto p = cmdmap.find("id");
if (p == cmdmap.end()) {
ss << "no osd id specified";
}
string sure;
- if (!cmd_getval_throws(cct, cmdmap, "sure", sure) ||
+ if (!cmd_getval(cct, cmdmap, "sure", sure) ||
sure != "--yes-i-really-mean-it") {
ss << "Are you SURE? Did you verify with 'ceph osd safe-to-destroy'? "
<< "This will mean real, permanent data loss, as well "
// optional id provided?
int64_t id = -1, cmd_id = -1;
- if (cmd_getval_throws(cct, cmdmap, "id", cmd_id)) {
+ if (cmd_getval(cct, cmdmap, "id", cmd_id)) {
if (cmd_id < 0) {
ss << "invalid osd id value '" << cmd_id << "'";
err = -EINVAL;
uuid_d uuid;
string uuidstr;
- if (cmd_getval_throws(cct, cmdmap, "uuid", uuidstr)) {
+ if (cmd_getval(cct, cmdmap, "uuid", uuidstr)) {
if (!uuid.parse(uuidstr.c_str())) {
ss << "invalid uuid value '" << uuidstr << "'";
err = -EINVAL;
return true;
} else if (prefix == "osd blacklist") {
string addrstr;
- cmd_getval_throws(cct, cmdmap, "addr", addrstr);
+ cmd_getval(cct, cmdmap, "addr", addrstr);
entity_addr_t addr;
if (!addr.parse(addrstr.c_str(), 0)) {
ss << "unable to parse address " << addrstr;
}
else {
string blacklistop;
- cmd_getval_throws(cct, cmdmap, "blacklistop", blacklistop);
+ cmd_getval(cct, cmdmap, "blacklistop", blacklistop);
if (blacklistop == "add") {
utime_t expires = ceph_clock_now();
double d;
// default one hour
- cmd_getval_throws(cct, cmdmap, "expire", d,
+ cmd_getval(cct, cmdmap, "expire", d,
g_conf()->mon_osd_blacklist_default_expire);
expires += d;
}
} else if (prefix == "osd pool mksnap") {
string poolstr;
- cmd_getval_throws(cct, cmdmap, "pool", poolstr);
+ cmd_getval(cct, cmdmap, "pool", poolstr);
int64_t pool = osdmap.lookup_pg_pool_name(poolstr.c_str());
if (pool < 0) {
ss << "unrecognized pool '" << poolstr << "'";
goto reply;
}
string snapname;
- cmd_getval_throws(cct, cmdmap, "snap", snapname);
+ cmd_getval(cct, 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";
return true;
} else if (prefix == "osd pool rmsnap") {
string poolstr;
- cmd_getval_throws(cct, cmdmap, "pool", poolstr);
+ cmd_getval(cct, cmdmap, "pool", poolstr);
int64_t pool = osdmap.lookup_pg_pool_name(poolstr.c_str());
if (pool < 0) {
ss << "unrecognized pool '" << poolstr << "'";
goto reply;
}
string snapname;
- cmd_getval_throws(cct, cmdmap, "snap", snapname);
+ cmd_getval(cct, 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";
} else if (prefix == "osd pool create") {
int64_t pg_num;
int64_t pgp_num;
- cmd_getval_throws(cct, cmdmap, "pg_num", pg_num, int64_t(0));
- cmd_getval_throws(cct, cmdmap, "pgp_num", pgp_num, pg_num);
+ cmd_getval(cct, cmdmap, "pg_num", pg_num, int64_t(0));
+ cmd_getval(cct, cmdmap, "pgp_num", pgp_num, pg_num);
string pool_type_str;
- cmd_getval_throws(cct, cmdmap, "pool_type", pool_type_str);
+ cmd_getval(cct, cmdmap, "pool_type", pool_type_str);
if (pool_type_str.empty())
pool_type_str = g_conf().get_val<string>("osd_pool_default_type");
string poolstr;
- cmd_getval_throws(cct, cmdmap, "pool", poolstr);
+ cmd_getval(cct, 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);
bool implicit_rule_creation = false;
int64_t expected_num_objects = 0;
string rule_name;
- cmd_getval_throws(cct, cmdmap, "rule", rule_name);
+ cmd_getval(cct, cmdmap, "rule", rule_name);
string erasure_code_profile;
- cmd_getval_throws(cct, cmdmap, "erasure_code_profile", erasure_code_profile);
+ cmd_getval(cct, cmdmap, "erasure_code_profile", erasure_code_profile);
if (pool_type == pg_pool_t::TYPE_ERASURE) {
if (erasure_code_profile == "")
rule_name = poolstr;
}
}
- cmd_getval_throws(g_ceph_context, cmdmap, "expected_num_objects",
+ cmd_getval(g_ceph_context, 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
}
rule_name = erasure_code_profile;
} else { // cmd is well-formed
- cmd_getval_throws(g_ceph_context, cmdmap, "expected_num_objects",
+ cmd_getval(g_ceph_context, cmdmap, "expected_num_objects",
expected_num_objects, int64_t(0));
}
}
}
int64_t fast_read_param;
- cmd_getval_throws(cct, cmdmap, "fast_read", fast_read_param, int64_t(-1));
+ cmd_getval(cct, 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;
prefix == "osd pool rm") {
// osd pool delete/rm <poolname> <poolname again> --yes-i-really-really-mean-it
string poolstr, poolstr2, sure;
- cmd_getval_throws(cct, cmdmap, "pool", poolstr);
- cmd_getval_throws(cct, cmdmap, "pool2", poolstr2);
- cmd_getval_throws(cct, cmdmap, "sure", sure);
+ cmd_getval(cct, cmdmap, "pool", poolstr);
+ cmd_getval(cct, cmdmap, "pool2", poolstr2);
+ cmd_getval(cct, cmdmap, "sure", sure);
int64_t pool = osdmap.lookup_pg_pool_name(poolstr.c_str());
if (pool < 0) {
ss << "pool '" << poolstr << "' does not exist";
goto update;
} else if (prefix == "osd pool rename") {
string srcpoolstr, destpoolstr;
- cmd_getval_throws(cct, cmdmap, "srcpool", srcpoolstr);
- cmd_getval_throws(cct, cmdmap, "destpool", destpoolstr);
+ cmd_getval(cct, cmdmap, "srcpool", srcpoolstr);
+ cmd_getval(cct, 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());
if (err)
goto reply;
string poolstr;
- cmd_getval_throws(cct, cmdmap, "pool", poolstr);
+ cmd_getval(cct, cmdmap, "pool", poolstr);
int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr);
if (pool_id < 0) {
ss << "unrecognized pool '" << poolstr << "'";
goto reply;
}
string tierpoolstr;
- cmd_getval_throws(cct, cmdmap, "tierpool", tierpoolstr);
+ cmd_getval(cct, cmdmap, "tierpool", tierpoolstr);
int64_t tierpool_id = osdmap.lookup_pg_pool_name(tierpoolstr);
if (tierpool_id < 0) {
ss << "unrecognized pool '" << tierpoolstr << "'";
// make sure new tier is empty
string force_nonempty;
- cmd_getval_throws(cct, cmdmap, "force_nonempty", force_nonempty);
+ cmd_getval(cct, 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") {
} else if (prefix == "osd tier remove" ||
prefix == "osd tier rm") {
string poolstr;
- cmd_getval_throws(cct, cmdmap, "pool", poolstr);
+ cmd_getval(cct, cmdmap, "pool", poolstr);
int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr);
if (pool_id < 0) {
ss << "unrecognized pool '" << poolstr << "'";
goto reply;
}
string tierpoolstr;
- cmd_getval_throws(cct, cmdmap, "tierpool", tierpoolstr);
+ cmd_getval(cct, cmdmap, "tierpool", tierpoolstr);
int64_t tierpool_id = osdmap.lookup_pg_pool_name(tierpoolstr);
if (tierpool_id < 0) {
ss << "unrecognized pool '" << tierpoolstr << "'";
if (err)
goto reply;
string poolstr;
- cmd_getval_throws(cct, cmdmap, "pool", poolstr);
+ cmd_getval(cct, cmdmap, "pool", poolstr);
int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr);
if (pool_id < 0) {
ss << "unrecognized pool '" << poolstr << "'";
goto reply;
}
string overlaypoolstr;
- cmd_getval_throws(cct, cmdmap, "overlaypool", overlaypoolstr);
+ cmd_getval(cct, cmdmap, "overlaypool", overlaypoolstr);
int64_t overlaypool_id = osdmap.lookup_pg_pool_name(overlaypoolstr);
if (overlaypool_id < 0) {
ss << "unrecognized pool '" << overlaypoolstr << "'";
} else if (prefix == "osd tier remove-overlay" ||
prefix == "osd tier rm-overlay") {
string poolstr;
- cmd_getval_throws(cct, cmdmap, "pool", poolstr);
+ cmd_getval(cct, cmdmap, "pool", poolstr);
int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr);
if (pool_id < 0) {
ss << "unrecognized pool '" << poolstr << "'";
if (err)
goto reply;
string poolstr;
- cmd_getval_throws(cct, cmdmap, "pool", poolstr);
+ cmd_getval(cct, cmdmap, "pool", poolstr);
int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr);
if (pool_id < 0) {
ss << "unrecognized pool '" << poolstr << "'";
goto reply;
}
string modestr;
- cmd_getval_throws(cct, cmdmap, "mode", modestr);
+ cmd_getval(cct, cmdmap, "mode", modestr);
pg_pool_t::cache_mode_t mode = pg_pool_t::get_cache_mode_from_str(modestr);
if (mode < 0) {
ss << "'" << modestr << "' is not a valid cache mode";
}
string sure;
- cmd_getval_throws(cct, cmdmap, "sure", sure);
+ cmd_getval(cct, cmdmap, "sure", sure);
if ((mode != pg_pool_t::CACHEMODE_WRITEBACK &&
mode != pg_pool_t::CACHEMODE_NONE &&
mode != pg_pool_t::CACHEMODE_PROXY &&
if (err)
goto reply;
string poolstr;
- cmd_getval_throws(cct, cmdmap, "pool", poolstr);
+ cmd_getval(cct, cmdmap, "pool", poolstr);
int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr);
if (pool_id < 0) {
ss << "unrecognized pool '" << poolstr << "'";
goto reply;
}
string tierpoolstr;
- cmd_getval_throws(cct, cmdmap, "tierpool", tierpoolstr);
+ cmd_getval(cct, cmdmap, "tierpool", tierpoolstr);
int64_t tierpool_id = osdmap.lookup_pg_pool_name(tierpoolstr);
if (tierpool_id < 0) {
ss << "unrecognized pool '" << tierpoolstr << "'";
}
int64_t size = 0;
- if (!cmd_getval_throws(cct, cmdmap, "size", size)) {
+ if (!cmd_getval(cct, cmdmap, "size", size)) {
ss << "unable to parse 'size' value '"
<< cmd_vartype_stringify(cmdmap.at("size")) << "'";
err = -EINVAL;
return true;
} else if (prefix == "osd pool set-quota") {
string poolstr;
- cmd_getval_throws(cct, cmdmap, "pool", poolstr);
+ cmd_getval(cct, cmdmap, "pool", poolstr);
int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr);
if (pool_id < 0) {
ss << "unrecognized pool '" << poolstr << "'";
}
string field;
- cmd_getval_throws(cct, cmdmap, "field", field);
+ cmd_getval(cct, cmdmap, "field", field);
if (field != "max_objects" && field != "max_bytes") {
ss << "unrecognized field '" << field << "'; should be 'max_bytes' or 'max_objects'";
err = -EINVAL;
// val could contain unit designations, so we treat as a string
string val;
- cmd_getval_throws(cct, cmdmap, "val", val);
+ cmd_getval(cct, cmdmap, "val", val);
string tss;
int64_t value;
if (field == "max_objects") {
} else if (prefix == "osd force-create-pg") {
pg_t pgid;
string pgidstr;
- cmd_getval_throws(cct, cmdmap, "pgid", pgidstr);
+ cmd_getval(cct, cmdmap, "pgid", pgidstr);
if (!pgid.parse(pgidstr.c_str())) {
ss << "invalid pgid '" << pgidstr << "'";
err = -EINVAL;
goto reply;
}
string sure;
- cmd_getval_throws(cct, cmdmap, "sure", sure);
+ cmd_getval(cct, cmdmap, "sure", sure);
if (sure != "--yes-i-really-mean-it") {
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 only if you are certain that all copies of the PG are in fact lost and you are willing to accept that the data is permanently destroyed. Pass --yes-i-really-mean-it to proceed.";
err = -EPERM;
projects / ceph.git / commitdiff