From: Nathan Cutler <ncutler@suse.com>
Date: Tue, 19 May 2020 20:40:55 +0000 (+0200)
Subject: mon/OSDMonitor: do not tell user 'proxy' cache-mode allowed
X-Git-Tag: v16.1.0~2283^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c2e8f8b1cd7e20bfaa42a607bde28131d0c2bcb0;p=ceph.git

mon/OSDMonitor: do not tell user 'proxy' cache-mode allowed

The 'proxy' cache-mode is deprecated and can no longer be used.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 498059d919bb..a69e9b3a0f3b 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -13078,8 +13078,6 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
       ss << "unable to set cache-mode '" << pg_pool_t::get_cache_mode_name(mode)
          << "' on a '" << pg_pool_t::get_cache_mode_name(p->cache_mode)
          << "' pool; only '"
-         << pg_pool_t::get_cache_mode_name(pg_pool_t::CACHEMODE_PROXY)
-	 << "','"
          << pg_pool_t::get_cache_mode_name(pg_pool_t::CACHEMODE_READPROXY)
         << "' allowed.";
       err = -EINVAL;