Merge pull request #1030 from dachary/wip-crush-location

osdc: = is not a delimiter in --crush-location

Reviewed-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2014-01-01 18:03:13 -08:00
commit af27f07086

View File

@ -147,7 +147,7 @@ void Objecter::handle_conf_change(const struct md_config_t *conf,
if (changed.count("crush_location")) {
crush_location.clear();
vector<string> lvec;
get_str_vec(cct->_conf->crush_location, lvec);
get_str_vec(cct->_conf->crush_location, ";, \t", lvec);
int r = CrushWrapper::parse_loc_multimap(lvec, &crush_location);
if (r < 0) {
lderr(cct) << "warning: crush_location '" << cct->_conf->crush_location