From d9aacd96acfe24b15c4e3b2441838945de1ab720 Mon Sep 17 00:00:00 2001 From: Joao Eduardo Luis Date: Tue, 29 Apr 2014 18:03:56 +0100 Subject: [PATCH] mon: OSDMonitor: return immediately if 'osd tier cache-mode' is a no-op Signed-off-by: Joao Eduardo Luis (cherry picked from commit d01aa5bff30441eec1ffaa3e59a21187f8478475) --- src/mon/OSDMonitor.cc | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 40cf6ccc6047c..7c4f198a51c19 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -5184,6 +5184,15 @@ done: err = -EINVAL; goto reply; } + + // pool already has this cache-mode set and there are no pending changes + if (p->cache_mode == mode && pending_inc.new_pools.count(pool_id) == 0) { + ss << "set cache-mode for pool '" << poolstr << "'" + << " to " << pg_pool_t::get_cache_mode_name(mode); + err = 0; + goto reply; + } + // go pending_inc.get_new_pool(pool_id, p)->cache_mode = mode; ss << "set cache-mode for pool '" << poolstr -- 2.39.5