Skip to content

Commit

Permalink
common/ceph_context: Show clear message if all features are enabled
Browse files Browse the repository at this point in the history
It's saying the following dangerous and experimental featuresare enabled
while the value is "*", it's not quite clear what's "*" stands for.

The patch update the message so that it's more clear when "*" is used in
place.

Signed-off-by: Dave Chen <wei.d.chen@intel.com>
  • Loading branch information
chendave committed Dec 28, 2016
1 parent 610a97a commit 78e9a61
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions src/common/ceph_context.cc
Expand Up @@ -304,9 +304,14 @@ class CephContextObs : public md_config_obs_t {
conf->enable_experimental_unrecoverable_data_corrupting_features,
cct->_experimental_features);
ceph_spin_unlock(&cct->_feature_lock);
if (!cct->_experimental_features.empty())
lderr(cct) << "WARNING: the following dangerous and experimental features are enabled: "
<< cct->_experimental_features << dendl;
if (!cct->_experimental_features.empty()) {
if (cct->_experimental_features.count("*")) {
lderr(cct) << "WARNING: all dangerous and experimental features are enabled." << dendl;
} else {
lderr(cct) << "WARNING: the following dangerous and experimental features are enabled: "
<< cct->_experimental_features << dendl;
}
}
}
if (changed.count("crush_location")) {
cct->crush_location.update_from_conf();
Expand Down

0 comments on commit 78e9a61

Please sign in to comment.