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

Merge pull request #11300 from liewegas/wip-bluestore-onode-add

Browse Source 
os/bluestore: fix onode cache addition race
This commit is contained in:
Sage Weil 2016-10-03 17:11:57 -05:00 committed by GitHub
commit 2efe05128b
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/os/bluestore/BlueStore.cc
View File

@ -1076,13 +1076,19 @@ void BlueStore::BufferSpace::finish_write(uint64_t seq)
#undef dout_prefix
#define dout_prefix *_dout << "bluestore.OnodeSpace(" << this << " in " << cache << ") "
void BlueStore::OnodeSpace::add(const ghobject_t& oid, OnodeRef o)
BlueStore::OnodeRef BlueStore::OnodeSpace::add(const ghobject_t& oid, OnodeRef o)
{
std::lock_guard<std::recursive_mutex> l(cache->lock);
auto p = onode_map.find(oid);
if (p != onode_map.end()) {
dout(30) << __func__ << " " << oid << " " << o
<< " raced, returning existing " << p->second << dendl;
return p->second;
}
dout(30) << __func__ << " " << oid << " " << o << dendl;
assert(onode_map.count(oid) == 0);
onode_map[oid] = o;
cache->_add_onode(o, 1);
return o;
}
BlueStore::OnodeRef BlueStore::OnodeSpace::lookup(const ghobject_t& oid)
@ -2181,8 +2187,7 @@ BlueStore::OnodeRef BlueStore::Collection::get_onode(
}
}
o.reset(on);
onode_map.add(oid, o);
return o;
return onode_map.add(oid, o);
}

2
src/os/bluestore/BlueStore.h
View File

@ -874,7 +874,7 @@ public:
clear();
}
void add(const ghobject_t& oid, OnodeRef o);
OnodeRef add(const ghobject_t& oid, OnodeRef o);
OnodeRef lookup(const ghobject_t& o);
void rename(OnodeRef& o, const ghobject_t& old_oid,
const ghobject_t& new_oid,