diff options
author | Sage Weil <sage@inktank.com> | 2013-08-27 13:44:52 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2013-08-27 15:48:50 -0700 |
commit | a6689e1d1132a730126144dfff65dc0284a4920f (patch) | |
tree | 6eed686c99d7d97ee73004f9ec9496bbec9aa504 | |
parent | e608932453917e152b740eec425c21354b4af115 (diff) | |
download | ceph-a6689e1d1132a730126144dfff65dc0284a4920f.tar.gz |
mon/OSDMonitor: 'osd tier cache-mode <pool> <mode>'
Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r-- | src/mon/MonCommands.h | 4 | ||||
-rw-r--r-- | src/mon/OSDMonitor.cc | 31 | ||||
-rw-r--r-- | src/osd/osd_types.h | 11 |
3 files changed, 46 insertions, 0 deletions
diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h index 5617b17fc78..d740c1341fe 100644 --- a/src/mon/MonCommands.h +++ b/src/mon/MonCommands.h @@ -525,6 +525,10 @@ COMMAND("osd tier remove " \ "name=pool,type=CephPoolname " \ "name=tierpool,type=CephPoolname", "remove the tier <tierpool> from base pool <pool>", "osd", "rw", "cli,rest") +COMMAND("osd tier cache-mode " \ + "name=pool,type=CephPoolname " \ + "name=mode,type=CephChoices,strings=none|writeback|invalidate+forward|readonly", \ + "specify the caching mode for cache tier <pool>", "osd", "rw", "cli,rest") /* * mon/ConfigKeyService.cc */ diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index f2c6d5e0cf7..af9cc1902f3 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -3692,6 +3692,37 @@ done: pending_inc.new_pools[tierpool_id].tier_of.clear(); wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, ss.str(), get_last_committed())); return true; + } else if (prefix == "osd tier cache-mode") { + string poolstr; + cmd_getval(g_ceph_context, cmdmap, "pool", poolstr); + int64_t pool_id = osdmap.lookup_pg_pool_name(poolstr); + if (pool_id < 0) { + ss << "unrecognized pool '" << poolstr << "'"; + err = -ENOENT; + goto reply; + } + const pg_pool_t *p = osdmap.get_pg_pool(pool_id); + assert(p); + if (p->tier_of.length() == 0) { + ss << "pool '" << poolstr << "' is not a tier"; + err = -EINVAL; + goto reply; + } + string modestr; + cmd_getval(g_ceph_context, 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"; + err = -EINVAL; + goto reply; + } + // go + ss << "set cache-mode for pool '" << poolstr << "' to " << mode; + if (pending_inc.new_pools.count(pool_id) == 0) + pending_inc.new_pools[pool_id] = *p; + pending_inc.new_pools[pool_id].cache_mode = mode; + wait_for_finished_proposal(new Monitor::C_Command(mon, m, 0, ss.str(), get_last_committed())); + return true; } else if (prefix == "osd pool set-quota") { string poolstr; cmd_getval(g_ceph_context, cmdmap, "pool", poolstr); diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index f6ed968cc49..2d769f624a8 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -753,6 +753,17 @@ struct pg_pool_t { default: return "unknown"; } } + static cache_mode_t get_cache_mode_from_str(const string& s) { + if (s == "none") + return CACHEMODE_NONE; + if (s == "writeback") + return CACHEMODE_WRITEBACK; + if (s == "invalidate+forward") + return CACHEMODE_INVALIDATE_FORWARD; + if (s == "readonly") + return CACHEMODE_READONLY; + return (cache_mode_t)-1; + } const char *get_cache_mode_name() const { return get_cache_mode_name(cache_mode); } |