diff options
author | Greg Farnum <gregory.farnum@dreamhost.com> | 2012-01-10 10:32:43 -0800 |
---|---|---|
committer | Greg Farnum <gregory.farnum@dreamhost.com> | 2012-01-10 10:47:22 -0800 |
commit | 45897b52af6586ba213993cdc409a27b8f21a58c (patch) | |
tree | 03af949f68c8f08432cbb79deadb033ecc5dea7e /src/mds | |
parent | ba00f95ad6d22ff4ad5d8d235c9435c6fca65c8c (diff) | |
download | ceph-45897b52af6586ba213993cdc409a27b8f21a58c.tar.gz |
mds: remove beacon_killer code.
This no longer does *anything* except print out
useless warning messages.
Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
Diffstat (limited to 'src/mds')
-rw-r--r-- | src/mds/MDS.cc | 36 | ||||
-rw-r--r-- | src/mds/MDS.h | 15 |
2 files changed, 0 insertions, 51 deletions
diff --git a/src/mds/MDS.cc b/src/mds/MDS.cc index f5efa28a46d..a9b4001ff1d 100644 --- a/src/mds/MDS.cc +++ b/src/mds/MDS.cc @@ -132,7 +132,6 @@ MDS::MDS(const std::string &n, Messenger *m, MonClient *mc) : // beacon beacon_last_seq = 0; beacon_sender = 0; - beacon_killer = 0; was_laggy = false; // tick @@ -656,8 +655,6 @@ void MDS::handle_mds_beacon(MMDSBeacon *m) while (!beacon_seq_stamp.empty() && beacon_seq_stamp.begin()->first <= seq) beacon_seq_stamp.erase(beacon_seq_stamp.begin()); - - reset_beacon_killer(); } else { dout(10) << "handle_mds_beacon " << ceph_mds_state_name(m->get_state()) << " seq " << m->get_seq() << " dne" << dendl; @@ -666,35 +663,6 @@ void MDS::handle_mds_beacon(MMDSBeacon *m) m->put(); } -void MDS::reset_beacon_killer() -{ - utime_t when = beacon_last_acked_stamp; - when += g_conf->mds_beacon_grace; - - dout(25) << "reset_beacon_killer last_acked_stamp at " << beacon_last_acked_stamp - << ", will die at " << when << dendl; - - if (beacon_killer) timer.cancel_event(beacon_killer); - - beacon_killer = new C_MDS_BeaconKiller(this, beacon_last_acked_stamp); - timer.add_event_at(when, beacon_killer); -} - -void MDS::beacon_kill(utime_t lab) -{ - if (lab == beacon_last_acked_stamp) { - dout(0) << "beacon_kill last_acked_stamp " << lab - << ", we are laggy!" - << dendl; - //suicide(); - } else { - dout(20) << "beacon_kill last_acked_stamp " << beacon_last_acked_stamp - << " != my " << lab - << ", doing nothing." - << dendl; - } -} - /* This function DOES put the passed message before returning*/ void MDS::handle_command(MMonCommand *m) { @@ -1551,10 +1519,6 @@ void MDS::suicide() << ", now " << ceph_mds_state_name(state) << dendl; // stop timers - if (beacon_killer) { - timer.cancel_event(beacon_killer); - beacon_killer = 0; - } if (beacon_sender) { timer.cancel_event(beacon_sender); beacon_sender = 0; diff --git a/src/mds/MDS.h b/src/mds/MDS.h index 4ea26dec20d..f74e2495803 100644 --- a/src/mds/MDS.h +++ b/src/mds/MDS.h @@ -279,19 +279,6 @@ class MDS : public Dispatcher { mds->beacon_send(); } } *beacon_sender; - class C_MDS_BeaconKiller : public Context { - MDS *mds; - utime_t lab; - public: - C_MDS_BeaconKiller(MDS *m, utime_t l) : mds(m), lab(l) {} - void finish(int r) { - if (mds->beacon_killer) { - mds->beacon_killer = 0; - mds->beacon_kill(lab); - } - // else mds is pbly already shutting down - } - } *beacon_killer; // tick and other timer fun class C_MDS_Tick : public Context { @@ -390,9 +377,7 @@ class MDS : public Dispatcher { void beacon_start(); void beacon_send(); - void beacon_kill(utime_t lab); void handle_mds_beacon(MMDSBeacon *m); - void reset_beacon_killer(); // messages bool _dispatch(Message *m); |