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

Merge pull request #2072 from ceph/wip-8738-next

Browse Source 
Patch up the CRUSH map compatibility guards

Reviewed-by: Loic Dachary <loic@dachary.org>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
Reviewed-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2014-07-04 18:35:24 -07:00
commit 50a21833fb
2 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/mon/OSDMonitor.cc
View File

@ -2996,7 +2996,7 @@ int OSDMonitor::check_cluster_features(uint64_t features,
{
stringstream unsupported_ss;
int unsupported_count = 0;
if (!(mon->get_quorum_features() & features)) {
if ((mon->get_quorum_features() & features) != features) {
unsupported_ss << "the monitor cluster";
++unsupported_count;
}
@ -3035,6 +3035,27 @@ int OSDMonitor::check_cluster_features(uint64_t features,
return 0;
}
bool OSDMonitor::validate_crush_against_features(const CrushWrapper *newcrush,
stringstream& ss)
{
OSDMap::Incremental new_pending = pending_inc;
::encode(*newcrush, new_pending.crush);
OSDMap newmap;
newmap.deepish_copy_from(osdmap);
newmap.apply_incremental(new_pending);
uint64_t features = newmap.get_features(CEPH_ENTITY_TYPE_MON, NULL);
stringstream features_ss;
int r = check_cluster_features(features, features_ss);
if (!r)
return true;
ss << "Could not change CRUSH: " << features_ss.str();
return false;
}
bool OSDMonitor::erasure_code_profile_in_use(const map<int64_t, pg_pool_t> &pools,
const string &profile,
ostream &ss)
@ -3649,6 +3670,11 @@ bool OSDMonitor::prepare_command_impl(MMonCommand *m,
goto reply;
}
if (!validate_crush_against_features(&crush, ss)) {
err = -EINVAL;
goto reply;
}
// sanity check: test some inputs to make sure this map isn't totally broken
dout(10) << " testing map" << dendl;
stringstream ess;
@ -4066,6 +4092,12 @@ bool OSDMonitor::prepare_command_impl(MMonCommand *m,
err = -EINVAL;
goto reply;
}
if (!validate_crush_against_features(&newcrush, ss)) {
err = -EINVAL;
goto reply;
}
pending_inc.crush.clear();
newcrush.encode(pending_inc.crush);
ss << "adjusted tunables profile to " << profile;

9
src/mon/OSDMonitor.h
View File

@ -186,6 +186,15 @@ private:
void update_msgr_features();
int check_cluster_features(uint64_t features, stringstream &ss);
/**
* check if the cluster supports the features required by the
* given crush map. Outputs the daemons which don't support it
* to the stringstream.
*
* @returns true if the map is passable, false otherwise
*/
bool validate_crush_against_features(const CrushWrapper *newcrush,
stringstream &ss);
void share_map_with_random_osd();