From bb653650812a10b46fda6dcf14c2d381067edad7 Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Tue, 29 Jan 2019 22:41:59 -0500 Subject: [PATCH] client: minor cleanup to MetaSession class Signed-off-by: Venky Shankar --- src/client/MetaSession.h | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/src/client/MetaSession.h b/src/client/MetaSession.h index c0901305a81..7702b40e33a 100644 --- a/src/client/MetaSession.h +++ b/src/client/MetaSession.h @@ -19,10 +19,10 @@ struct MetaRequest; struct MetaSession { mds_rank_t mds_num; ConnectionRef con; - version_t seq; - uint64_t cap_gen; + version_t seq = 0; + uint64_t cap_gen = 0; utime_t cap_ttl, last_cap_renew_request; - uint64_t cap_renew_seq; + uint64_t cap_renew_seq = 0; entity_addrvec_t addrs; feature_bitset_t mds_features; @@ -34,17 +34,17 @@ struct MetaSession { STATE_CLOSED, STATE_STALE, STATE_REJECTED, - } state; + } state = STATE_OPENING; enum { RECLAIM_NULL, RECLAIMING, RECLAIM_OK, RECLAIM_FAIL, - } reclaim_state; + } reclaim_state = RECLAIM_NULL; - int mds_state; - bool readonly; + int mds_state = MDSMap::STATE_NULL; + bool readonly = false; list waiting_for_open; @@ -56,13 +56,9 @@ struct MetaSession { ceph::ref_t release; - MetaSession(mds_rank_t mds_num, ConnectionRef con, - const entity_addrvec_t& addrs) - : mds_num(mds_num), con(con), - seq(0), cap_gen(0), cap_renew_seq(0), addrs(addrs), - state(STATE_OPENING), reclaim_state(RECLAIM_NULL), - mds_state(MDSMap::STATE_NULL), readonly(false) - {} + MetaSession(mds_rank_t mds_num, ConnectionRef con, const entity_addrvec_t& addrs) + : mds_num(mds_num), con(con), addrs(addrs) { + } const char *get_state_name() const; -- 2.39.5