diff options
| author | Sage Weil <sage@inktank.com> | 2013-10-03 21:15:36 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2013-10-03 21:15:36 -0700 |
| commit | bae4c9573ac1d713af5caf74da4df303c43fd2d2 (patch) | |
| tree | 7af4fc0bec6857a7fe0d9a07b70c6b8e271f830f /src | |
| parent | fea1e0e56cbd3d82a173b50532ff51b8bcee9359 (diff) | |
| download | ceph-wip-pool.tar.gz | |
mon: make 'mon {add,remove}_data_pool ...' take pool name or idwip-pool
Take either a pool name or an id. Fix up the tests accordingly.
Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mon/MDSMonitor.cc | 53 | ||||
| -rw-r--r-- | src/mon/MonCommands.h | 8 |
2 files changed, 45 insertions, 16 deletions
diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 48c1c99d584..9c561d8dce8 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -952,20 +952,49 @@ bool MDSMonitor::prepare_command(MMonCommand *m) } } else if (prefix == "mds add_data_pool") { int64_t poolid; - cmd_getval(g_ceph_context, cmdmap, "poolid", poolid); - pending_mdsmap.add_data_pool(poolid); - ss << "added data pool " << poolid << " to mdsmap"; - r = 0; - + if (!cmd_getval(g_ceph_context, cmdmap, "poolid", poolid)) { + string poolname; + cmd_getval(g_ceph_context, cmdmap, "pool", poolname); + poolid = mon->osdmon()->osdmap.lookup_pg_pool_name(poolname); + if (poolid < 0) { + string err; + poolid = strict_strtol(poolname.c_str(), 10, &err); + if (err.length()) { + r = -ENOENT; + poolid = -1; + ss << "pool '" << poolname << "' does not exist"; + } + } + } + if (poolid >= 0) { + pending_mdsmap.add_data_pool(poolid); + ss << "added data pool " << poolid << " to mdsmap"; + r = 0; + } } else if (prefix == "mds remove_data_pool") { int64_t poolid; - cmd_getval(g_ceph_context, cmdmap, "poolid", poolid); - r = pending_mdsmap.remove_data_pool(poolid); - if (r == -ENOENT) - r = 0; - if (r == 0) - ss << "removed data pool " << poolid << " from mdsmap"; - + if (!cmd_getval(g_ceph_context, cmdmap, "poolid", poolid)) { + string poolname; + cmd_getval(g_ceph_context, cmdmap, "pool", poolname); + poolid = mon->osdmon()->osdmap.lookup_pg_pool_name(poolname); + if (poolid < 0) { + string err; + poolid = strict_strtol(poolname.c_str(), 10, &err); + if (err.length()) { + r = -ENOENT; + poolid = -1; + ss << "pool '" << poolname << "' does not exist"; + } + } + } + if (poolid >= 0) { + cmd_getval(g_ceph_context, cmdmap, "poolid", poolid); + r = pending_mdsmap.remove_data_pool(poolid); + if (r == -ENOENT) + r = 0; + if (r == 0) + ss << "removed data pool " << poolid << " from mdsmap"; + } } else if (prefix == "mds newfs") { MDSMap newmap; int64_t metadata, data; diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h index 33e00a98d30..a961574179c 100644 --- a/src/mon/MonCommands.h +++ b/src/mon/MonCommands.h @@ -284,11 +284,11 @@ COMMAND("mds unset " \ "name=sure,type=CephString,req=false", \ "unset <key>", "mds", "w", "cli,rest") COMMAND("mds add_data_pool " \ - "name=poolid,type=CephInt,range=0", \ - "add data pool <poolid>", "mds", "rw", "cli,rest") + "name=pool,type=CephString", \ + "add data pool <pool>", "mds", "rw", "cli,rest") COMMAND("mds remove_data_pool " \ - "name=poolid,type=CephInt,range=0", \ - "remove data pool <poolid>", "mds", "rw", "cli,rest") + "name=pool,type=CephString", \ + "remove data pool <pool>", "mds", "rw", "cli,rest") COMMAND("mds newfs " \ "name=metadata,type=CephInt,range=0 " \ "name=data,type=CephInt,range=0 " \ |