]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: kill redundant call of cancel_all_events()
authorxie xingguo <xie.xingguo@zte.com.cn>
Tue, 2 Aug 2016 05:45:26 +0000 (13:45 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Tue, 2 Aug 2016 22:21:07 +0000 (06:21 +0800)
The agent_timer.shutdown() method will call cancel_all_events()
within in a more safe and elegant way, so we don't have to
call it explicitly here.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/OSD.cc

index 4bc3b185546647be21482fbdc49dd46238fb80c5..1970d47d7fc6f26f39a95eee8eadc7247b754cd5 100644 (file)
@@ -465,7 +465,6 @@ void OSDService::start_shutdown()
 {
   {
     Mutex::Locker l(agent_timer_lock);
-    agent_timer.cancel_all_events();
     agent_timer.shutdown();
   }
 }