Objecter::shutdown(): call SafeTimer::Join()

Objecter::shutdown() needs to call Timer::join() to ensure that
concurrently exectuting events in other threads get flushed before the
Objecter and its Timer are destroyed.

Signed-off-by: Colin McCabe <colinm@hq.newdream.net>

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 4bb8fede1e0b3e768a4612a43950245b3141279d..7e47e7201bc6c04c9da528fe1498039d249e4305 100644 (file)
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -58,6 +58,7 @@ void Objecter::shutdown()
 {
   assert(client_lock.is_locked());  // otherwise event cancellation is unsafe
   timer.cancel_all();
+  timer.join();
 }