mon: remove old subscribe renewal-based timeouts

This is no longer needed/used.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index e808a943cafabb7a8b598fc80099571a5c3bac83..4bbf314beb3cc8d351562d6f180b60b727424f2d 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -3437,13 +3437,7 @@ void Monitor::_ms_dispatch(Message *m)
     logger->set(l_mon_num_sessions, session_map.get_size());
     logger->inc(l_mon_session_add);
 
-    if (!src_is_mon) {
-      dout(30) << __func__ << "  setting timeout on session" << dendl;
-      // set an initial timeout here, so we will trim this session
-      // even if they don't do anything.
-      s->until = ceph_clock_now(g_ceph_context);
-      s->until += g_conf->mon_subscribe_interval;
-    } else {
+    if (src_is_mon) {
       // give it monitor caps; the peer type has been authenticated
       dout(5) << __func__ << " setting monitor caps on this connection" << dendl;
       if (!s->caps.is_allow_all()) // but no need to repeatedly copy
@@ -4131,8 +4125,6 @@ void Monitor::handle_subscribe(MonOpRequestRef op)
   MonSession *s = op->get_session();
   assert(s);
 
-  s->until = ceph_clock_now(g_ceph_context);
-  s->until += g_conf->mon_subscribe_interval;
   for (map<string,ceph_mon_subscribe_item>::iterator p = m->what.begin();
        p != m->what.end();
        ++p) {

diff --git a/src/mon/Session.h b/src/mon/Session.h
index e8b187e2ba33e2ffa4dbcbde6418daa92efc6db0..d91de2666dbad6a63f91f4593a40a992d9db876d 100644 (file)
--- a/src/mon/Session.h
+++ b/src/mon/Session.h
@@ -41,7 +41,6 @@ struct MonSession : public RefCountedObject {
   ConnectionRef con;
   entity_inst_t inst;
   utime_t session_timeout;
-  utime_t until;
   utime_t time_established;
   bool closed;
   xlist<MonSession*>::item item;