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

ObjectCacher: keep track of outstanding reads on an object

Browse Source 
Reads always use C_ReadFinish as a callback (and they are the only
user of this callback). Keep an xlist of these for each object, so
they can remove themselves as they finish. To prevent racing requests
and with discard removing objects from the cache, clear the xlist in
the object destructor, so if the Object is still valid the set_item
will still be on the list.

Make the ObjectCacher constructor take an Object* instead of the pool
and object id, which are derived from the Object* anyway.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
This commit is contained in:
Josh Durgin 2013-03-08 17:49:27 -08:00
parent e6caf69cf4
commit f6f876fe51
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/osdc/ObjectCacher.cc
View File

@ -594,8 +594,8 @@ void ObjectCacher::bh_read(BufferHead *bh)
mark_rx(bh);
// finisher
C_ReadFinish *onfinish = new C_ReadFinish(this, bh->ob->oloc.pool,
bh->ob->get_soid(), bh->start(), bh->length());
C_ReadFinish *onfinish = new C_ReadFinish(this, bh->ob,
bh->start(), bh->length());
ObjectSet *oset = bh->ob->oset;

16
src/osdc/ObjectCacher.h
View File

@ -45,6 +45,7 @@ class ObjectCacher {
CephContext *cct;
class Object;
class ObjectSet;
class C_ReadFinish;
typedef void (*flush_set_callback_t) (void *p, ObjectSet *oset);
@ -182,6 +183,7 @@ class ObjectCacher {
int dirty_or_tx;
map< tid_t, list<Context*> > waitfor_commit;
xlist<C_ReadFinish*> reads;
public:
Object(const Object& other);
@ -198,6 +200,7 @@ class ObjectCacher {
os->objects.push_back(&set_item);
}
~Object() {
reads.clear();
assert(ref == 0);
assert(data.empty());
assert(dirty_or_tx == 0);
@ -453,12 +456,21 @@ class ObjectCacher {
sobject_t oid;
loff_t start;
uint64_t length;
xlist<C_ReadFinish*>::item set_item;
public:
bufferlist bl;
C_ReadFinish(ObjectCacher *c, int _poolid, sobject_t o, loff_t s, uint64_t l) :
oc(c), poolid(_poolid), oid(o), start(s), length(l) {}
C_ReadFinish(ObjectCacher *c, Object *ob, loff_t s, uint64_t l) :
oc(c), poolid(ob->oloc.pool), oid(ob->get_soid()), start(s), length(l),
set_item(this) {
ob->reads.push_back(&set_item);
}
void finish(int r) {
oc->bh_read_finish(poolid, oid, start, length, bl, r);
// object destructor clears the list
if (set_item.is_on_list())
set_item.remove_myself();
}
};