Merge pull request #12676 from chendave/master

common/ceph_context: Show clear message if all features are enabled

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Sage Weil 2016-12-30 12:58:20 -06:00 committed by GitHub
commit 98405376ad

View File

@ -304,9 +304,14 @@ public:
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();