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 241db4a9c733fd46004bed586069474acf68cd39..64ccd60d99ef9ff5ce92fc45d1b6898b539db780 100644 (file)
--- 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 190a5d3940479e17be70beeb4987d4ea851858f5..a35fbe1b10fab0a114f2076c98c2c773e4bd6d02 100644 (file)
--- 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");