osd: stop timer thread before forking

diff --git a/src/common/Timer.cc b/src/common/Timer.cc
index f434e1f99c2c85835ce029454e700989e870c263..d63687d997ea14b6c53975b71e857ecd36abc2fe 100644 (file)
--- a/src/common/Timer.cc
+++ b/src/common/Timer.cc
@@ -179,7 +179,8 @@ void Timer::cancel_timer()
     dout(10) << "waiting for thread to finish" << dendl;
     void *ptr;
     timer_thread.join(&ptr);
-    
+    thread_stop = false;
+
     dout(10) << "thread finished, exit code " << ptr << dendl;
   }
 }

diff --git a/src/cosd.cc b/src/cosd.cc
index 56aa8446746bf22d0218ad5308b6334a442549a0..3f22b45b1a5b0ad18c4fa648df184ec30ffa8a14 100644 (file)
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -115,6 +115,8 @@ int main(int argc, const char **argv)
        << " dev " << dev
        << std::endl;
 
+  g_timer.shutdown();
+
   rank.start();
 
   rank.set_policy(entity_name_t::TYPE_MON, Rank::Policy::fast_fail());

diff --git a/src/vstartnew.sh b/src/vstartnew.sh
index 0a981c95027e5f87b5ed45f23392b7c559639365..46fdbe3462eeefd3180409ae6de03c0376893587 100755 (executable)
--- a/src/vstartnew.sh
+++ b/src/vstartnew.sh
@@ -38,7 +38,7 @@ for osd in 0 #1 2 3 #4 5 6 7 8 9 10 11 12 13 14 15
 do
  $CEPH_BIN/cosd --mkfs_for_osd $osd dev/osd$osd  # initialize empty object store
  #valgrind --leak-check=full --show-reachable=yes $CEPH_BIN/cosd dev/osd$osd --debug_ms 1 --debug_osd 20 --debug_filestore 10 1>out/o$osd & #--debug_osd 40
- $CEPH_BIN/cosd dev/osd$osd -d --debug_ms 1 --debug_osd 20 # --debug_filestore 10
+ $CEPH_BIN/cosd -m $IP:12345 dev/osd$osd -d --debug_ms 1 --debug_osd 20 # --debug_filestore 10
 done
 
 # mds