client: put MDSSession pointers in the msd_session map, rather than the sessions...

This is a bit cleaner and clears the way to make it more closely mimic the kernel.

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 529bcdadfe9b2505688412e8e0a59e32c2625f3e..9bce21578e1fa7228e0707fcb4a7e55f62612bd8 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -556,7 +556,7 @@ void Client::insert_dentry_inode(Dir *dir, const string& dname, LeaseStat *dleas
       dn->lease_ttl = dttl;
       dn->lease_mds = mds;
       dn->lease_seq = dlease->seq;
-      dn->lease_gen = mds_sessions[mds].cap_gen;
+      dn->lease_gen = mds_sessions[mds]->cap_gen;
     }
   }
   dn->cap_shared_gen = dir->parent_inode->shared_gen;
@@ -797,8 +797,8 @@ void Client::connect_mds_targets(int mds)
 {
   //this function shouldn't be called unless we lost a connection
   assert (mds_sessions.count(mds));
-  MDSSession &s = mds_sessions[mds];
-  if (!s.requests.empty()) {
+  MDSSession *s = mds_sessions[mds];
+  if (!s->requests.empty()) {
     const MDSMap::mds_info_t& info = mdsmap->get_mds_info(mds);
     for (set<int>::const_iterator q = info.export_targets.begin();
         q != info.export_targets.end();
@@ -1031,12 +1031,13 @@ void Client::handle_client_session(MClientSession *m)
 {
   dout(10) << "handle_client_session " << *m << dendl;
   int from = m->get_source().num();
-
+  MDSSession *mds_session = mds_sessions[from];
   switch (m->get_op()) {
   case CEPH_SESSION_OPEN:
-    mds_sessions[from].mds_num = from;
-    mds_sessions[from].seq = 0;
-    mds_sessions[from].inst = m->get_source_inst();
+    mds_sessions[from] = mds_session = new MDSSession();
+    mds_session->mds_num = from;
+    mds_session->seq = 0;
+    mds_session->inst = m->get_source_inst();
     renew_caps(from);
     break;
 
@@ -1044,19 +1045,20 @@ void Client::handle_client_session(MClientSession *m)
     mount_cond.Signal();
     remove_session_caps(from);
     kick_requests(from, true);
+    delete mds_session;
     mds_sessions.erase(from);
     break;
 
   case CEPH_SESSION_RENEWCAPS:
-    if (mds_sessions[from].cap_renew_seq == m->get_seq()) {
-      mds_sessions[from].cap_ttl = 
-       mds_sessions[from].last_cap_renew_request + mdsmap->get_session_timeout();
+    if (mds_session->cap_renew_seq == m->get_seq()) {
+      mds_session->cap_ttl =
+       mds_session->last_cap_renew_request + mdsmap->get_session_timeout();
       wake_inode_waiters(from);
     }
     break;
 
   case CEPH_SESSION_STALE:
-    mds_sessions[from].was_stale = true;
+    mds_session->was_stale = true;
     renew_caps(from);
     break;
 
@@ -1098,7 +1100,7 @@ void Client::send_request(MetaRequest *request, int mds)
   if (request->inode && request->inode->caps.count(mds))
     request->sent_on_mseq = request->inode->caps[mds]->mseq;
 
-  mds_sessions[mds].requests.push_back(&request->item);
+  mds_sessions[mds]->requests.push_back(&request->item);
 
   dout(10) << "send_request " << *r << " to mds" << mds << dendl;
   messenger->send_message(r, mdsmap->get_inst(mds));
@@ -1223,7 +1225,7 @@ void Client::handle_client_reply(MClientReply *reply)
 
   if (!request->got_unsafe) {
     request->got_unsafe = true;
-    mds_sessions[mds_num].unsafe_requests.push_back(&request->unsafe_item);
+    mds_sessions[mds_num]->unsafe_requests.push_back(&request->unsafe_item);
 
     Cond cond;
     request->dispatch_cond = &cond;
@@ -1346,16 +1348,16 @@ void Client::handle_mds_map(MMDSMap* m)
   mdsmap->decode(m->get_encoded());
 
   // reset session
-  for (map<int,MDSSession>::iterator p = mds_sessions.begin();
+  for (map<int,MDSSession*>::iterator p = mds_sessions.begin();
        p != mds_sessions.end();
        p++) {
     int oldstate = oldmap->get_state(p->first);
     int newstate = mdsmap->get_state(p->first);
     if (!mdsmap->is_up(p->first) ||
-       mdsmap->get_inst(p->first) != p->second.inst) {
-      messenger->mark_down(p->second.inst.addr);
+       mdsmap->get_inst(p->first) != p->second->inst) {
+      messenger->mark_down(p->second->inst.addr);
       if (mdsmap->is_up(p->first))
-       p->second.inst = mdsmap->get_inst(p->first);
+       p->second->inst = mdsmap->get_inst(p->first);
     } else if (oldstate == newstate)
       continue;  // no change
     
@@ -1428,7 +1430,7 @@ void Client::send_reconnect(int mds)
   }
   
   // reset my cap seq number
-  mds_sessions[mds].seq = 0;
+  mds_sessions[mds]->seq = 0;
   
   //connect to the mds' offload targets
   connect_mds_targets(mds);
@@ -1459,8 +1461,8 @@ void Client::kick_requests(int mds, bool signal)
 
 void Client::resend_unsafe_requests(int mds_num)
 {
-  MDSSession& mds = mds_sessions[mds_num];
-  for (xlist<MetaRequest*>::iterator iter = mds.unsafe_requests.begin();
+  MDSSession *mds = mds_sessions[mds_num];
+  for (xlist<MetaRequest*>::iterator iter = mds->unsafe_requests.begin();
        !iter.end();
        ++iter)
     send_request(*iter, mds_num);
@@ -1475,13 +1477,13 @@ void Client::resend_unsafe_requests(int mds_num)
 
 void Client::got_mds_push(int mds)
 {
-  MDSSession& s = mds_sessions[mds];
+  MDSSession *s = mds_sessions[mds];
 
-  s.seq++;
-  dout(10) << " mds" << mds << " seq now " << s.seq << dendl;
-  if (s.closing)
-    messenger->send_message(new MClientSession(CEPH_SESSION_REQUEST_CLOSE, s.seq),
-                           s.inst);
+  s->seq++;
+  dout(10) << " mds" << mds << " seq now " << s->seq << dendl;
+  if (s->closing)
+    messenger->send_message(new MClientSession(CEPH_SESSION_REQUEST_CLOSE, s->seq),
+                           s->inst);
 }
 
 void Client::handle_lease(MClientLease *m)
@@ -1834,7 +1836,7 @@ void Client::check_caps(Inode *in, bool is_delayed)
       flush = in->dirty_caps;
       if (flush && !in->flushing_caps) {
        dout(10) << " " << *in << " flushing" << dendl;
-       mds_sessions[mds].flushing_caps.push_back(&in->flushing_cap_item);
+       mds_sessions[mds]->flushing_caps.push_back(&in->flushing_cap_item);
        in->flushing_cap_seq = ++last_flush_seq;
        in->get();
        num_flushing_caps++;
@@ -1973,7 +1975,7 @@ void Client::signal_cond_list(list<Cond*>& ls)
 
 void Client::wake_inode_waiters(int mds_num)
 {
-  MDSSession * mds = &mds_sessions[mds_num];
+  MDSSession * mds = mds_sessions[mds_num];
   xlist<InodeCap*>::iterator iter = mds->caps.begin();
   while (!iter.end()){
     signal_cond_list((*iter)->inode->waitfor_caps);
@@ -2056,10 +2058,11 @@ void Client::add_update_cap(Inode *in, int mds, uint64_t cap_id,
                            int flags)
 {
   InodeCap *cap = 0;
+  MDSSession *mds_session = mds_sessions[mds];
   if (in->caps.count(mds)) {
     cap = in->caps[mds];
   } else {
-    mds_sessions[mds].num_caps++;
+    mds_session->num_caps++;
     if (!in->is_any_caps()) {
       assert(in->snaprealm == 0);
       in->snaprealm = get_snap_realm(realm);
@@ -2073,10 +2076,10 @@ void Client::add_update_cap(Inode *in, int mds, uint64_t cap_id,
       in->exporting_mseq = 0;
     }
     in->caps[mds] = cap = new InodeCap;
-    mds_sessions[mds].caps.push_back(&cap->cap_item);
-    cap->session = &mds_sessions[mds];
+    mds_session->caps.push_back(&cap->cap_item);
+    cap->session = mds_session;
     cap->inode = in;
-    cap->gen = mds_sessions[mds].cap_gen;
+    cap->gen = mds_session->cap_gen;
     cap_list.push_back(&in->cap_item);
   }
 
@@ -2110,7 +2113,7 @@ void Client::remove_cap(Inode *in, int mds)
     return;
   }
   InodeCap *cap = in->caps[mds];
-  MDSSession *session = &mds_sessions[mds];
+  MDSSession *session = mds_sessions[mds];
   
   if (!session->release)
     session->release = new MClientCapRelease;
@@ -2145,7 +2148,7 @@ void Client::remove_all_caps(Inode *in)
 void Client::remove_session_caps(int mds_num) 
 {
   if (mds_sessions.count(mds_num)) {
-    MDSSession* mds = &mds_sessions[mds_num];
+    MDSSession* mds = mds_sessions[mds_num];
     while (mds->caps.size())
       remove_cap((*mds->caps.begin())->inode, mds_num);
   }
@@ -2154,7 +2157,7 @@ void Client::remove_session_caps(int mds_num)
 void Client::trim_caps(int mds, int max)
 {
   dout(10) << "trim_caps mds" << mds << " max" << max << dendl;
-  MDSSession *s = &mds_sessions[mds];
+  MDSSession *s = mds_sessions[mds];
 
   int trimmed = 0;
   xlist<InodeCap*>::iterator p = s->caps.begin();
@@ -2222,12 +2225,12 @@ void Client::wait_sync_caps(uint64_t want)
  retry:
   dout(10) << "wait_sync_caps want " << want << " (last is " << last_flush_seq << ", "
           << num_flushing_caps << " total flushing)" << dendl;
-  for (map<int,MDSSession>::iterator p = mds_sessions.begin();
+  for (map<int,MDSSession*>::iterator p = mds_sessions.begin();
        p != mds_sessions.end();
        p++) {
-    if (p->second.flushing_caps.empty())
+    if (p->second->flushing_caps.empty())
        continue;
-    Inode *in = p->second.flushing_caps.front();
+    Inode *in = p->second->flushing_caps.front();
     if (in->flushing_cap_seq <= want) {
       dout(10) << " waiting on mds" << p->first << " tid " << in->flushing_cap_seq
               << " (want " << want << ")" << dendl;
@@ -2242,7 +2245,7 @@ void Client::wait_sync_caps(uint64_t want)
 void Client::kick_flushing_caps(int mds)
 {
   dout(10) << "kick_flushing_caps" << dendl;
-  MDSSession *session = &mds_sessions[mds];
+  MDSSession *session = mds_sessions[mds];
 
   for (xlist<Inode*>::iterator p = session->flushing_caps.begin(); !p.end(); ++p) {
     Inode *in = *p;
@@ -2918,13 +2921,13 @@ int Client::unmount()
 
   
   // send session closes!
-  for (map<int,MDSSession>::iterator p = mds_sessions.begin();
+  for (map<int,MDSSession*>::iterator p = mds_sessions.begin();
        p != mds_sessions.end();
        ++p) {
     dout(2) << "sending client_session close to mds" << p->first
-           << " seq " << p->second.seq << dendl;
-    p->second.closing = true;
-    messenger->send_message(new MClientSession(CEPH_SESSION_REQUEST_CLOSE, p->second.seq),
+           << " seq " << p->second->seq << dendl;
+    p->second->closing = true;
+    messenger->send_message(new MClientSession(CEPH_SESSION_REQUEST_CLOSE, p->second->seq),
                            mdsmap->get_inst(p->first));
   }
 
@@ -2969,12 +2972,12 @@ void Client::tick()
       renew_caps();
 
     // send any cap releases
-    for (map<int,MDSSession>::iterator p = mds_sessions.begin();
+    for (map<int,MDSSession*>::iterator p = mds_sessions.begin();
         p != mds_sessions.end();
         p++) {
-      if (p->second.release) {
-       messenger->send_message(p->second.release, mdsmap->get_inst(p->first));
-       p->second.release = 0;
+      if (p->second->release) {
+       messenger->send_message(p->second->release, mdsmap->get_inst(p->first));
+       p->second->release = 0;
       }
     }
   }
@@ -2998,7 +3001,7 @@ void Client::renew_caps()
   dout(10) << "renew_caps()" << dendl;
   last_cap_renew = g_clock.now();
   
-  for (map<int,MDSSession>::iterator p = mds_sessions.begin();
+  for (map<int,MDSSession*>::iterator p = mds_sessions.begin();
        p != mds_sessions.end();
        p++) {
     dout(15) << "renew_caps requesting from mds" << p->first << dendl;
@@ -3009,8 +3012,9 @@ void Client::renew_caps()
 
 void Client::renew_caps(const int mds) {
   dout(10) << "renew_caps mds" << mds << dendl;
-  mds_sessions[mds].last_cap_renew_request = g_clock.now();
-  uint64_t seq = ++mds_sessions[mds].cap_renew_seq;
+  MDSSession *session = mds_sessions[mds];
+  session->last_cap_renew_request = g_clock.now();
+  uint64_t seq = ++session->cap_renew_seq;
   messenger->send_message(new MClientSession(CEPH_SESSION_REQUEST_RENEWCAPS, seq),
                          mdsmap->get_inst(mds));
 
@@ -3078,13 +3082,13 @@ int Client::_lookup(Inode *dir, const string& dname, Inode **target)
     if (dn->lease_mds >= 0 && 
        dn->lease_ttl > now &&
        mds_sessions.count(dn->lease_mds)) {
-      MDSSession &s = mds_sessions[dn->lease_mds];
-      if (s.cap_ttl > now &&
-         s.cap_gen == dn->lease_gen) {
+      MDSSession *s = mds_sessions[dn->lease_mds];
+      if (s->cap_ttl > now &&
+         s->cap_gen == dn->lease_gen) {
        *target = dn->inode;
        goto done;
       }
-      dout(20) << " bad lease, cap_ttl " << s.cap_ttl << ", cap_gen " << s.cap_gen
+      dout(20) << " bad lease, cap_ttl " << s->cap_ttl << ", cap_gen " << s->cap_gen
               << " vs lease_gen " << dn->lease_gen << dendl;
     }
     // dir lease?
@@ -3126,9 +3130,9 @@ int Client::get_or_create(Inode *dir, const char* name,
        dn->lease_mds >= 0 && 
        dn->lease_ttl > now &&
        mds_sessions.count(dn->lease_mds)) {
-      MDSSession &s = mds_sessions[dn->lease_mds];
-      if (s.cap_ttl > now &&
-         s.cap_gen == dn->lease_gen) {
+      MDSSession *s = mds_sessions[dn->lease_mds];
+      if (s->cap_ttl > now &&
+         s->cap_gen == dn->lease_gen) {
        if (expect_null)
          return -EEXIST;
        else

diff --git a/src/client/Client.h b/src/client/Client.h
index d5d409b16a9a7b67a9526da258e3ca67d68c4bd1..8ec6fca3ce328a688cea499e8b196a34b3171bcf 100644 (file)
--- a/src/client/Client.h
+++ b/src/client/Client.h
@@ -756,7 +756,7 @@ public:
   client_t whoami;
 
   // mds sessions
-  map<int, MDSSession> mds_sessions;  // mds -> push seq
+  map<int, MDSSession*> mds_sessions;  // mds -> push seq
   map<int, list<Cond*> > waiting_for_session;
   list<Cond*> waiting_for_mdsmap;