Skip to content

Commit

Permalink
Merge pull request #12676 from chendave/master
Browse files Browse the repository at this point in the history
common/ceph_context: Show clear message if all features are enabled

Reviewed-by: Kefu Chai <kchai@redhat.com>
  • Loading branch information
liewegas committed Dec 30, 2016
2 parents eef842e + 091547d commit 9840537
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 9840537

Please sign in to comment.