RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 09:57:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #24867 into master

Browse Source 
* refs/pull/24867/head:
	mon: compensate for not having STDLIB_MAP_SPLICING

Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: João Eduardo Luís <joao@suse.de>
This commit is contained in:
Sage Weil 2018-11-20 06:50:50 -06:00
commit b84730a921
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mon/OSDMonitor.cc
View File

@ -8684,7 +8684,12 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op,
mempool::osdmap::map<string,map<string,string>> old_ec_profiles = mempool::osdmap::map<string,map<string,string>> old_ec_profiles =
osdmap.get_erasure_code_profiles(); osdmap.get_erasure_code_profiles();
auto ec_profiles = pending_inc.get_erasure_code_profiles(); auto ec_profiles = pending_inc.get_erasure_code_profiles();
#ifdef HAVE_STDLIB_MAP_SPLICING
ec_profiles.merge(old_ec_profiles); ec_profiles.merge(old_ec_profiles);
#else
ec_profiles.insert(make_move_iterator(begin(old_ec_profiles)),
make_move_iterator(end(old_ec_profiles)));
#endif
list<string> referenced_by; list<string> referenced_by;
for (auto &i: ec_profiles) { for (auto &i: ec_profiles) {
for (auto &j: i.second) { for (auto &j: i.second) {