MemStore: update for the new ObjectStore interface

68fdcfa1cc249af859400a2ce4590fefbb2f525b changed the ObjectStore
interface in the 'next' branch, which was merged into master by
e5a02c33e23e4fbdc7bf0f16a5bbff61f4e37186. 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>

diff --git a/src/os/MemStore.cc b/src/os/MemStore.cc
index fdf3ee5bcf70d7320ac1884c08d9167a5db1e034..0d1303cfb7a0a840cbebcbb8e6606ae250ac7e66 100644 (file)
--- a/src/os/MemStore.cc
+++ b/src/os/MemStore.cc
@@ -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,

diff --git a/src/os/MemStore.h b/src/os/MemStore.h
index 9c4d0037a515f96963be1cbc5ad57533857ae484..423ea7a5555d1f80c3778c922a37c0bc1ed4fc03 100644 (file)
--- a/src/os/MemStore.h
+++ b/src/os/MemStore.h
@@ -348,7 +348,8 @@ public:
 
   int queue_transactions(
     Sequencer *osr, list<Transaction*>& tls,
-    TrackedOpRef op = TrackedOpRef());
+    TrackedOpRef op = TrackedOpRef(),
+    ThreadPool::TPHandle *handle = NULL);
 };