fixing pump_coro_t flushing incorrectness

rethinkdb · Aug 18, 2015 · 87ec495 · 87ec495
1 parent 46ef651
commit 87ec495
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/concurrency/pump_coro.cc b/src/concurrency/pump_coro.cc
@@ -95,7 +95,7 @@ void pump_coro_t::run(auto_drainer_t::lock_t keepalive) {
 
         acq.reset(&mutex);
         for (auto it = flush_waiters.begin();
-                it != flush_waiters.upper_bound(timestamp);
+                it != flush_waiters.upper_bound(local_timestamp);
                 ++it) {
             it->second->pulse_if_not_already_pulsed();
         }

diff --git a/src/concurrency/pump_coro.hpp b/src/concurrency/pump_coro.hpp
@@ -13,7 +13,10 @@
 /* `pump_coro_t` is a class for managing a blocking function that must eventually run
 after a certain event occurs; but if the event occurs multiple times in quick succession,
 it's OK for the function to only run once. For example, we might want to flush a value to
-disk every time it changes. */
+disk every time it changes.
+  Note that this is not tested very well for `max_callbacks` > 1, and you should be very
+careful about your assumptions on how flushing works when providing `max_callbacks` > 1.
+*/
 
 class pump_coro_t : public home_thread_mixin_debug_only_t{
 public: