From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Tue, 2 Aug 2016 05:45:26 +0000 (+0800)
Subject: osd: kill redundant call of cancel_all_events()
X-Git-Tag: ses5-milestone5~180^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9ce5028eea864407e7afb1bcc2786a9b892fff84;p=ceph.git

osd: kill redundant call of cancel_all_events()

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>
---

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 4bc3b1855466..1970d47d7fc6 100644
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -465,7 +465,6 @@ void OSDService::start_shutdown()
 {
   {
     Mutex::Locker l(agent_timer_lock);
-    agent_timer.cancel_all_events();
     agent_timer.shutdown();
   }
 }