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

OSDMonitor: use deepish_copy_from for remove_down_pg_temp

Browse Source 
This is a backport of 368852f6c0.

Make a deep copy of the OSDMap to avoid clobbering the in-memory copy with
the call to apply_incremental.

Fixes: #7060
Signed-off-by: Sage Weil <sage@inktank.com>
This commit is contained in:
Sage Weil 2014-01-28 11:00:34 -08:00
parent 61914d82bf
commit d5080799c8
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mon/OSDMonitor.cc
View File

@ -431,7 +431,8 @@ void OSDMonitor::remove_redundant_pg_temp()
void OSDMonitor::remove_down_pg_temp()
{
dout(10) << "remove_down_pg_temp" << dendl;
OSDMap tmpmap(osdmap);
OSDMap tmpmap;
tmpmap.deepish_copy_from(osdmap);
tmpmap.apply_incremental(pending_inc);
for (map<pg_t,vector<int> >::iterator p = tmpmap.pg_temp->begin();