uclient: wait for mds sessions close on unmount

diff --git a/src/client/Client.cc b/src/client/Client.cc
index a07d1c09a3b6910a66f9470c15d592efa9f58e05..3c4ff5a20e0315e1101a7889de9f301d5984fc59 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -892,6 +892,7 @@ void Client::handle_client_session(MClientSession *m)
 
   case CEPH_SESSION_CLOSE:
     mds_sessions.erase(from);
+    mount_cond.Signal();
     // FIXME: kick requests (hard) so that they are redirected.  or fail.
     break;
 
@@ -2420,6 +2421,12 @@ int Client::unmount()
                            mdsmap->get_inst(p->first));
   }
 
+  // wait for sessions to close
+  while (mds_sessions.size()) {
+    dout(2) << "waiting for " << mds_sessions.size() << " mds sessions to close" << dendl;
+    mount_cond.Wait(client_lock);
+  }
+
   // leave cluster
   client_lock.Unlock();
   monclient->unmount();