RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-19 17:08:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

osd: fix deadlock in map handler

Browse Source 
To avoid deadlock,
- we need to drop osd_lock while we flush.
- we need to take map_lock _after_ we flush.

Signed-off-by: Sage Weil <sage@newdream.net>
This commit is contained in:
Sage Weil 2010-10-22 10:11:21 -07:00
parent 28d899285c
commit 78352b32cd
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/osd/OSD.cc
View File

@ -2338,8 +2338,6 @@ void OSD::handle_osd_map(MOSDMap *m)
store->flush();
osd_lock.Lock();
map_lock.get_write();
assert(osd_lock.is_locked());
ObjectStore::Transaction t;
@ -2404,7 +2402,12 @@ void OSD::handle_osd_map(MOSDMap *m)
}
// flush new maps (so they are readable)
osd_lock.Unlock();
store->flush();
osd_lock.Lock();
// finally, take map_lock _after_ we do this flush, to avoid deadlock
map_lock.get_write();
// advance if we can
bool advanced = false;