From: xiexingguo Date: Wed, 2 Dec 2015 08:22:26 +0000 (+0800) Subject: OSD: remove heartbeat_epoch which is redundant X-Git-Tag: v10.0.3~192^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b89179a3a0bf3d08897f9c9a89d53cece8e62008;p=ceph.git OSD: remove heartbeat_epoch which is redundant Signed-off-by: xiexingguo --- diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 25a170576aad..f51fe7716a70 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1573,7 +1573,7 @@ OSD::OSD(CephContext *cct_, ObjectStore *store_, session_waiting_lock("OSD::session_waiting_lock"), heartbeat_lock("OSD::heartbeat_lock"), heartbeat_stop(false), heartbeat_update_lock("OSD::heartbeat_update_lock"), - heartbeat_need_update(true), heartbeat_epoch(0), + heartbeat_need_update(true), hbclient_messenger(hb_clientm), hb_front_server_messenger(hb_front_serverm), hb_back_server_messenger(hb_back_serverm), @@ -3526,7 +3526,6 @@ void OSD::maybe_update_heartbeat_peers() dout(10) << "maybe_update_heartbeat_peers updating" << dendl; - heartbeat_epoch = osdmap->get_epoch(); // build heartbeat from set if (is_active()) { diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 8c0cd8e9c4cb..ff72e8e8caa5 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -1512,7 +1512,6 @@ private: bool heartbeat_stop; Mutex heartbeat_update_lock; // orders under heartbeat_lock bool heartbeat_need_update; ///< true if we need to refresh our heartbeat peers - epoch_t heartbeat_epoch; ///< last epoch we updated our heartbeat peers map heartbeat_peers; ///< map of osd id to HeartbeatInfo utime_t last_mon_heartbeat; Messenger *hbclient_messenger;