RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-03 09:32:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon: OSDMonitor: Make 'osd pool rename' idempotent

Browse Source 
'ceph osd pool rename' takes two arguments: source pool and dest pool.
If by chance 'source pool' does not exist and 'destination pool' does,
then, in order to assure it's idempotent, we want to assume that if
'source pool' no longer exists is because it was already renamed.

However, while we will return success in such case, we want to make sure
to let the user know that we made such assumption.  Mostly to warn the
user of such a thing in case of a mistake on the user's part (say, the
user didn't notice that the source pool didn't exist, while the dest did),
but also to make sure that the user is not surprised by the command
returning success if the user expected an ENOENT or EEXIST.

Fixes: #6635

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>
This commit is contained in:
Joao Eduardo Luis 2013-10-25 03:33:53 +01:00
parent 87d3f88742
commit c14c98d3f0
1 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/mon/OSDMonitor.cc
View File

@ -3784,25 +3784,43 @@ done:
string srcpoolstr, destpoolstr; string srcpoolstr, destpoolstr;
cmd_getval(g_ceph_context, cmdmap, "srcpool", srcpoolstr); cmd_getval(g_ceph_context, cmdmap, "srcpool", srcpoolstr);
cmd_getval(g_ceph_context, cmdmap, "destpool", destpoolstr); cmd_getval(g_ceph_context, cmdmap, "destpool", destpoolstr);
int64_t pool = osdmap.lookup_pg_pool_name(srcpoolstr.c_str()); int64_t pool_src = osdmap.lookup_pg_pool_name(srcpoolstr.c_str());
if (pool < 0) { int64_t pool_dst = osdmap.lookup_pg_pool_name(destpoolstr.c_str());
ss << "unrecognized pool '" << srcpoolstr << "'";
err = -ENOENT; if (pool_src < 0) {
} else if (osdmap.lookup_pg_pool_name(destpoolstr.c_str()) >= 0) { if (pool_dst >= 0) {
// src pool doesn't exist, dst pool does exist: to ensure idempotency
// of operations, assume this rename succeeded, as it is not changing
// the current state. Make sure we output something understandable
// for whoever is issuing the command, if they are paying attention,
// in case it was not intentional; or to avoid a "wtf?" and a bug
// report in case it was intentional, while expecting a failure.
ss << "pool '" << srcpoolstr << "' does not exist; pool '"
<< destpoolstr << "' does -- assuming successful rename";
err = 0;
} else {
ss << "unrecognized pool '" << srcpoolstr << "'";
err = -ENOENT;
}
goto reply;
} else if (pool_dst >= 0) {
// source pool exists and so does the destination pool
ss << "pool '" << destpoolstr << "' already exists"; ss << "pool '" << destpoolstr << "' already exists";
err = -EEXIST; err = -EEXIST;
} else { goto reply;
int ret = _prepare_rename_pool(pool, destpoolstr);
if (ret == 0) {
ss << "pool '" << srcpoolstr << "' renamed to '" << destpoolstr << "'";
} else {
ss << "failed to rename pool '" << srcpoolstr << "' to '" << destpoolstr << "': "
<< cpp_strerror(ret);
}
getline(ss, rs);
wait_for_finished_proposal(new Monitor::C_Command(mon, m, ret, rs, get_last_committed()));
return true;
} }
int ret = _prepare_rename_pool(pool_src, destpoolstr);
if (ret == 0) {
ss << "pool '" << srcpoolstr << "' renamed to '" << destpoolstr << "'";
} else {
ss << "failed to rename pool '" << srcpoolstr << "' to '" << destpoolstr << "': "
<< cpp_strerror(ret);
}
getline(ss, rs);
wait_for_finished_proposal(new Monitor::C_Command(mon, m, ret, rs, get_last_committed()));
return true;
} else if (prefix == "osd pool set") { } else if (prefix == "osd pool set") {
err = prepare_command_pool_set(cmdmap, ss); err = prepare_command_pool_set(cmdmap, ss);
if (err < 0) if (err < 0)