mds: show session load average in dump session

Signed-off-by: Venky Shankar <vshankar@redhat.com>
(cherry picked from commit 682dc08cbd521342b4abc45fd85edb2dd7bc5682)

Conflicts:
    src/mds/SessionMap.h

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index 885895aa63f307654aa6028de458294701a3cea8..61d493c2ff04d5d726e8c262d0451b1e939d0e44 100644 (file)
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -2143,6 +2143,9 @@ void MDSRankDispatcher::dump_sessions(const SessionFilter &filter, Formatter *f)
     f->dump_int("num_caps", s->caps.size());
 
     f->dump_string("state", s->get_state_name());
+    if (s->is_open() || s->is_stale()) {
+      f->dump_unsigned("request_load_avg", s->get_load_avg());
+    }
     f->dump_int("replay_requests", is_clientreplay() ? s->get_request_count() : 0);
     f->dump_unsigned("completed_requests", s->get_num_completed_requests());
     f->dump_bool("reconnecting", server->waiting_for_reconnect(p->first.num()));

diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h
index 91a8345809675158a1062f5f168423ea1b5482a9..16173e8d8e2cc43cffe353cab543004096db134f 100644 (file)
--- a/src/mds/SessionMap.h
+++ b/src/mds/SessionMap.h
@@ -104,7 +104,7 @@ private:
   std::deque<version_t> projected;
 
   // request load average for this session
-  DecayCounter load_avg;
+  mutable DecayCounter load_avg;
   DecayRate    load_avg_rate;
 
 public:
@@ -209,6 +209,9 @@ public:
     assert(is_open() || is_stale());
     load_avg_rate.set_halflife(rate);
   }
+  uint64_t get_load_avg() const {
+    return (uint64_t)load_avg.get(ceph_clock_now(), load_avg_rate);
+  }
   void hit_session() {
     load_avg.hit(ceph_clock_now(), load_avg_rate);
   }