From: Sage Weil <sage@redhat.com>
Date: Mon, 25 Feb 2019 19:23:13 +0000 (-0600)
Subject: auth/AuthRegistry: mark 'secure' con mode experimental for now
X-Git-Tag: v14.1.1~109^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd73b4c3930c7c02ddacf5423f07a12e6cfb8e65;p=ceph.git

auth/AuthRegistry: mark 'secure' con mode experimental for now

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/auth/AuthRegistry.cc b/src/auth/AuthRegistry.cc
index 241db4a9c733..64ccd60d99ef 100644
--- a/src/auth/AuthRegistry.cc
+++ b/src/auth/AuthRegistry.cc
@@ -99,7 +99,9 @@ void AuthRegistry::_parse_mode_list(const string& s,
     if (i == "crc") {
       v->push_back(CEPH_CON_MODE_CRC);
     } else if (i == "secure") {
-      v->push_back(CEPH_CON_MODE_SECURE);
+      if (cct->check_experimental_feature_enabled("ms-mode-secure")) {
+	v->push_back(CEPH_CON_MODE_SECURE);
+      }
     } else {
       lderr(cct) << "WARNING: unknown connection mode " << i << dendl;
     }
diff --git a/src/test/test_auth.cc b/src/test/test_auth.cc
index 190a5d394047..a35fbe1b10fa 100644
--- a/src/test/test_auth.cc
+++ b/src/test/test_auth.cc
@@ -23,6 +23,9 @@ TEST(AuthRegistry, con_modes)
 					     CEPH_CON_MODE_CRC };
   const std::vector<uint32_t> secure = { CEPH_CON_MODE_SECURE };
 
+  cct->_conf.set_val(
+    "enable_experimental_unrecoverable_data_corrupting_features", "*");
+
   // baseline: everybody agrees
   cct->_set_module_type(CEPH_ENTITY_TYPE_CLIENT);
   cct->_conf.set_val("ms_cluster_mode", "crc secure");