RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-29 22:43:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

mon/OSDMonitor: prevent injection of crush map violating require_min_compat_client

Browse Source 
Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2017-05-04 12:24:27 -05:00
parent 7c35fd09cd
commit 5274db81dc
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mon/OSDMonitor.cc
View File

@ -5251,17 +5251,29 @@ bool OSDMonitor::validate_crush_against_features(const CrushWrapper *newcrush,
newmap.deepish_copy_from(osdmap);
newmap.apply_incremental(new_pending);
// client compat
if (newmap.require_min_compat_client.length()) {
auto mv = newmap.get_min_compat_client();
if (mv.first > newmap.require_min_compat_client) {
ss << "new crush map requires client version " << mv
<< " but require_min_compat_client is "
<< newmap.require_min_compat_client;
return false;
}
}
// osd compat
uint64_t features =
newmap.get_features(CEPH_ENTITY_TYPE_MON, NULL) |
newmap.get_features(CEPH_ENTITY_TYPE_OSD, NULL);
stringstream features_ss;
int r = check_cluster_features(features, features_ss);
if (!r)
return true;
if (r) {
ss << "Could not change CRUSH: " << features_ss.str();
return false;
}
ss << "Could not change CRUSH: " << features_ss.str();
return false;
return true;
}
bool OSDMonitor::erasure_code_profile_in_use(