common: 'enable experimental data corrupting features' now understands '*'

'*' allows any feature.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/src/common/ceph_context.cc b/src/common/ceph_context.cc
index 877dd539284ca0d86ea6c5f07cfe66060232d020..ff7bf2bf0e6b31cb5941dac90461ab2a16fd4893 100644 (file)
--- a/src/common/ceph_context.cc
+++ b/src/common/ceph_context.cc
@@ -230,7 +230,8 @@ bool CephContext::check_experimental_feature_enabled(const std::string& feat,
                                                     std::ostream *message)
 {
   ceph_spin_lock(&_feature_lock);
-  bool enabled = _experimental_features.count(feat);
+  bool enabled = (_experimental_features.count(feat) ||
+                 _experimental_features.count("*"));
   ceph_spin_unlock(&_feature_lock);
 
   if (enabled) {

diff --git a/src/test/common/test_context.cc b/src/test/common/test_context.cc
index c32fed30b32260142cea001152159b36f30a9511..921fc90ff5fa6bcd3764fbc034ccc09a49b1d017 100644 (file)
--- a/src/test/common/test_context.cc
+++ b/src/test/common/test_context.cc
@@ -82,6 +82,13 @@ TEST(CephContext, experimental_features)
   ASSERT_FALSE(cct->check_experimental_feature_enabled("bar"));
   ASSERT_TRUE(cct->check_experimental_feature_enabled("baz"));
 
+  cct->_conf->set_val("enable_experimental_unrecoverable_data_corrupting_features",
+                     "*");
+  cct->_conf->apply_changes(&cout);
+  ASSERT_TRUE(cct->check_experimental_feature_enabled("foo"));
+  ASSERT_TRUE(cct->check_experimental_feature_enabled("bar"));
+  ASSERT_TRUE(cct->check_experimental_feature_enabled("baz"));
+
   cct->_log->flush();
 }