]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mds: remove some cruft
authorSage Weil <sage.weil@dreamhost.com>
Sun, 12 Feb 2012 22:12:44 +0000 (14:12 -0800)
committerSage Weil <sage.weil@dreamhost.com>
Wed, 15 Feb 2012 05:03:54 +0000 (21:03 -0800)
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
src/mds/MDS.cc

index cc5609aa60b902a8bb93b0d01f734839489d83a3..dd56136aeb1e5a52901a3614ee06114ea1ca4809 100644 (file)
@@ -579,8 +579,6 @@ void MDS::tick()
 void MDS::beacon_start()
 {
   beacon_send();         // send first beacon
-  
-  //reset_beacon_killer(); // schedule killer
 }
   
 
@@ -1542,7 +1540,7 @@ void MDS::suicide()
     tick_event = 0;
   }
   timer.cancel_all_events();
-  //timer.join();  // this will deadlock from beacon_kill -> suicide
+  //timer.join();
   
   // shut down cache
   mdcache->shutdown();