diff options
| author | Loic Dachary <loic@dachary.org> | 2014-01-01 14:57:52 +0100 |
|---|---|---|
| committer | Loic Dachary <loic@dachary.org> | 2014-01-01 15:32:35 +0100 |
| commit | 2b848a91d9e56fd6aa08e6ba0a99a0c366f6f5bb (patch) | |
| tree | 2fbae17f15fb32c548fea6598dd964cdc1a0a77c /src/osdc | |
| parent | Merge branch 'next' (diff) | |
| download | ceph-2b848a91d9e56fd6aa08e6ba0a99a0c366f6f5bb.tar.xz ceph-2b848a91d9e56fd6aa08e6ba0a99a0c366f6f5bb.zip | |
osdc: = is not a delimiter in --crush-location
When parsing the crush location
--crush-location 'root=default host=hostA'
it must create the vector
[ 'root=default', 'host=hostA' ]
but the default list of separators of get_str_vec includes = which will
create
[ 'root', 'default', 'host', 'hostA' ]
instead. Set the list of delimiters to exclude = instead.
Signed-off-by: Loic Dachary <loic@dachary.org>
Diffstat (limited to 'src/osdc')
| -rw-r--r-- | src/osdc/Objecter.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 25e60b5911e..3da9be9c1c0 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -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 |