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

MemStore: update for the new ObjectStore interface

Browse Source 
68fdcfa1cc changed the ObjectStore
interface in the 'next' branch, which was merged into master by
e5a02c33e2. Unfortunately the
Memstore (added via the master branch) was not corrected for this
interface change.

Signed-off-by: Greg Farnum <greg@inktank.com>
Reviewed-by: David Zafman <david.zafman@inktank.com>
This commit is contained in:
Greg Farnum 2013-12-10 15:51:39 -08:00 committed by David Zafman
parent e5a02c33e2
commit b8884e01a0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/os/MemStore.cc
View File

@ -640,13 +640,17 @@ ObjectMap::ObjectMapIterator MemStore::get_omap_iterator(coll_t cid,
int MemStore::queue_transactions(Sequencer *osr,
list<Transaction*>& tls,
TrackedOpRef op)
TrackedOpRef op,
ThreadPool::TPHandle *handle)
{
// fixme: ignore the Sequencer and serialize everything.
Mutex::Locker l(apply_lock);
for (list<Transaction*>::iterator p = tls.begin(); p != tls.end(); ++p)
for (list<Transaction*>::iterator p = tls.begin(); p != tls.end(); ++p) {
// poke the TPHandle heartbeat just to exercise that code path
handle->reset_tp_timeout();
_do_transaction(**p);
}
Context *on_apply = NULL, *on_apply_sync = NULL, *on_commit = NULL;
ObjectStore::Transaction::collect_contexts(tls, &on_apply, &on_commit,

3
src/os/MemStore.h
View File

@ -348,7 +348,8 @@ public:
int queue_transactions(
Sequencer *osr, list<Transaction*>& tls,
TrackedOpRef op = TrackedOpRef());
TrackedOpRef op = TrackedOpRef(),
ThreadPool::TPHandle *handle = NULL);
};