renew, resume, etc. caps from kernel client

diff --git a/src/config.cc b/src/config.cc
index 89d7696c885031596ed3b3c3e06b17dcf3331cc7..9cca65d00c148e8f976925317a31554edbabdd85 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -237,8 +237,8 @@ md_config_t g_conf = {
   mds_beacon_interval: 4, //30.0,
   mds_beacon_grace: 15, //60*60.0,
 
-  mds_cap_timeout: 10,        // cap bits time out if client idle
-  mds_session_autoclose: 30, // autoclose idle session 
+  mds_cap_timeout: 100,        // cap bits time out if client idle
+  mds_session_autoclose: 300, // autoclose idle session 
 
   mds_tick_interval: 5,
 

diff --git a/src/kernel/client.c b/src/kernel/client.c
index f992a154ab2b36c7caad07ecb7736224d0e07868..48f87af39f6c661e4b92b84d0060545f1efd59c1 100644 (file)
--- a/src/kernel/client.c
+++ b/src/kernel/client.c
@@ -290,8 +290,8 @@ void ceph_destroy_client(struct ceph_client *cl)
 
        /* unmount */
        /* ... */
-       
-       
+
+       ceph_mdsc_stop(&cl->mdsc);      
 
        ceph_messenger_destroy(cl->msgr);
        put_client_counter();

diff --git a/src/kernel/inode.c b/src/kernel/inode.c
index 623a2e2481b235fb8d77724fc9ed5414580383c1..5ff9c9f4326ebdf98d1df9115a0898e7d3add01e 100644 (file)
--- a/src/kernel/inode.c
+++ b/src/kernel/inode.c
@@ -258,9 +258,7 @@ int ceph_handle_cap_grant(struct inode *inode, struct ceph_mds_file_caps *grant,
        }
 
        /* new cap? */
-       dout(10, "1\n");
        cap = get_cap_for_mds(inode, mds);
-       dout(10, "2\n");
        if (!cap) {
                dout(10, "adding new cap inode %p for mds%d\n", inode, mds);
                cap = ceph_add_cap(inode, session, le32_to_cpu(grant->caps), le32_to_cpu(grant->seq));
@@ -268,9 +266,7 @@ int ceph_handle_cap_grant(struct inode *inode, struct ceph_mds_file_caps *grant,
        } 
 
        /* revocation? */
-       dout(10, "3\n");
        newcaps = le32_to_cpu(grant->caps);
-       dout(10, "4\n");
        if (cap->caps & ~newcaps) {
                used = ceph_caps_used(ci);
                dout(10, "revocation: %d -> %d, used %d\n", cap->caps, newcaps, used);
@@ -283,7 +279,6 @@ int ceph_handle_cap_grant(struct inode *inode, struct ceph_mds_file_caps *grant,
        }
        
        /* grant or no-op */
-       dout(10, "5\n");
        if (cap->caps == newcaps) {
                dout(10, "no-op: %d -> %d\n", cap->caps, newcaps);
        } else {

diff --git a/src/kernel/mds_client.c b/src/kernel/mds_client.c
index fbb03bfd14579df62d1684000c1d4c2636f73df0..0f0e25b9315869a05b9f984983c3969ada52c6a9 100644 (file)
--- a/src/kernel/mds_client.c
+++ b/src/kernel/mds_client.c
@@ -168,10 +168,11 @@ static void wait_for_new_map(struct ceph_mds_client *mdsc)
        dout(30, "wait_for_new_map exit\n");
 }
 
-static int open_session(struct ceph_mds_client *mdsc, struct ceph_mds_session *session, int mds)
+static int open_session(struct ceph_mds_client *mdsc, struct ceph_mds_session *session)
 {
        struct ceph_msg *msg;
        int mstate;
+       int mds = session->s_mds;
 
        /* mds active? */
        mstate = ceph_mdsmap_get_state(mdsc->mdsmap, mds);
@@ -203,12 +204,38 @@ static int open_session(struct ceph_mds_client *mdsc, struct ceph_mds_session *s
        return 0;
 }
 
+static int resume_session(struct ceph_mds_client *mdsc, struct ceph_mds_session *session)
+{
+       int mds = session->s_mds;
+       struct ceph_msg *msg;
+       struct list_head *cp;
+       struct ceph_inode_cap *cap;
+
+       dout(10, "resume_session to mds%d\n", mds);
+
+       /* note cap staleness */
+       spin_lock(&session->s_cap_lock);
+       list_for_each(cp, &session->s_caps) {
+               cap = list_entry(cp, struct ceph_inode_cap, session_caps);
+               cap->caps = 0;
+       }
+       spin_unlock(&session->s_cap_lock);
+       
+       /* send request_resume message */
+       msg = create_session_msg(CEPH_SESSION_REQUEST_RESUME, session->s_cap_seq);
+       if (IS_ERR(msg))
+               return PTR_ERR(msg);  /* fixme */
+       //session->s_state = CEPH_MDS_SESSION_OPENING;
+       send_msg_mds(mdsc, msg, mds);
+       return 0;
+}
+
 void ceph_mdsc_handle_session(struct ceph_mds_client *mdsc, struct ceph_msg *msg)
 {
        __u32 op;
        __u64 seq;
        struct ceph_mds_session *session;
-       int from = msg->hdr.src.name.num;
+       int mds = msg->hdr.src.name.num;
        struct ceph_mds_session_head *h = msg->front.iov_base;
 
        if (msg->front.iov_len != sizeof(*h))
@@ -219,23 +246,22 @@ void ceph_mdsc_handle_session(struct ceph_mds_client *mdsc, struct ceph_msg *msg
        seq = le64_to_cpu(h->seq);
        
        /* handle */
+       session = get_session(mdsc, mds);
        dout(1, "handle_session op %d seq %llu\n", op, seq);
        spin_lock(&mdsc->lock);
        switch (op) {
        case CEPH_SESSION_OPEN:
-               dout(1, "session open from mds%d\n", from);
-               session = get_session(mdsc, from);
+               dout(1, "session open from mds%d\n", mds);
                session->s_state = CEPH_MDS_SESSION_OPEN;
                complete(&session->s_completion);
                ceph_mdsc_put_session(session);
                break;
 
        case CEPH_SESSION_CLOSE:
-               session = get_session(mdsc, from);
                if (session->s_cap_seq == seq) {
-                       dout(1, "session close from mds%d\n", from);
+                       dout(1, "session close from mds%d\n", mds);
                        complete(&session->s_completion); /* for good measure */
-                       unregister_session(mdsc, from);
+                       unregister_session(mdsc, mds);
                } else {
                        dout(1, "ignoring session close from mds%d, seq %llu < my seq %llu\n", 
                             msg->hdr.src.name.num, seq, session->s_cap_seq);
@@ -243,6 +269,19 @@ void ceph_mdsc_handle_session(struct ceph_mds_client *mdsc, struct ceph_msg *msg
                ceph_mdsc_put_session(session);
                break;
 
+       case CEPH_SESSION_RENEWCAPS:
+               dout(10, "session renewed caps from mds%d\n", mds);
+               break;
+
+       case CEPH_SESSION_STALE:
+               dout(10, "session stale from mds%d\n", mds);
+               resume_session(mdsc, session);
+               break;
+
+       case CEPH_SESSION_RESUME:
+               dout(10, "session resumed by mds%d\n", mds);
+               break;
+
        default:
                dout(0, "bad session op %d\n", op);
                BUG_ON(1);
@@ -262,6 +301,13 @@ bad:
 
 /* exported functions */
 
+void schedule_delayed(struct ceph_mds_client *mdsc)
+{
+       schedule_delayed_work(&mdsc->delayed_work, HZ*60);
+}
+
+void delayed_work(struct work_struct *work);
+
 void ceph_mdsc_init(struct ceph_mds_client *mdsc, struct ceph_client *client)
 {
        spin_lock_init(&mdsc->lock);
@@ -273,6 +319,17 @@ void ceph_mdsc_init(struct ceph_mds_client *mdsc, struct ceph_client *client)
        INIT_RADIX_TREE(&mdsc->request_tree, GFP_KERNEL);
        mdsc->last_requested_map = 0;
        init_completion(&mdsc->map_waiters);
+       INIT_DELAYED_WORK(&mdsc->delayed_work, delayed_work);
+
+       /* hack fixme */
+       schedule_delayed(mdsc);
+}
+
+void ceph_mdsc_stop(struct ceph_mds_client *mdsc)
+{
+       /* close sessions, caps */
+       /* IMPLEMENT ME */
+       cancel_delayed_work_sync(&mdsc->delayed_work);
 }
 
 
@@ -368,7 +425,7 @@ retry:
        /* open? */
        if (session->s_state == CEPH_MDS_SESSION_NEW ||
            session->s_state == CEPH_MDS_SESSION_CLOSING) {
-               err = open_session(mdsc, session, mds);
+               err = open_session(mdsc, session);
                BUG_ON(err && err != -EAGAIN);
        }
        if (session->s_state != CEPH_MDS_SESSION_OPEN) {
@@ -1025,7 +1082,48 @@ int ceph_mdsc_update_cap_wanted(struct ceph_inode_info *ci, int wanted)
        return 0;
 }
 
+int send_renewcaps(struct ceph_mds_client *mdsc, int mds)
+{
+       struct ceph_msg *msg;
+       
+       dout(10, "send_renew_caps to mds%d\n", mds);
+       
+       msg = create_session_msg(CEPH_SESSION_REQUEST_RENEWCAPS, 0);
+       if (IS_ERR(msg))
+               return PTR_ERR(msg);
+       send_msg_mds(mdsc, msg, mds);
+       return 0;
+}
+
+int ceph_mdsc_renew_caps(struct ceph_mds_client *mdsc) 
+{
+       int i;
+       dout(10, "renew_caps\n");
+       for (i=0; i<mdsc->max_sessions; i++) {
+               if (mdsc->sessions[i] == 0 ||
+                   mdsc->sessions[i]->s_state < CEPH_MDS_SESSION_OPEN)
+                       continue;
+               send_renewcaps(mdsc, i);
+       }
+       return 0;
+}
 
+void delayed_work(struct work_struct *work)
+{
+       int i;
+       struct ceph_mds_client *mdsc = container_of(work, struct ceph_mds_client, delayed_work.work);
 
+       dout(10, "delayed_work on %p\n", mdsc);
+       
+       /* renew caps */
+       for (i=0; i<mdsc->max_sessions; i++) {
+               if (mdsc->sessions[i] == 0 ||
+                   mdsc->sessions[i]->s_state < CEPH_MDS_SESSION_OPEN)
+                       continue;
+               send_renewcaps(mdsc, i);
+       }
+       
+       schedule_delayed(mdsc);
+}
 
 /* eof */

diff --git a/src/kernel/mds_client.h b/src/kernel/mds_client.h
index 10e30c09423572846a69b5873a7025dc1a8d41bc..73408b11f7a1db3e52cad96781efc28162d1f892 100644 (file)
--- a/src/kernel/mds_client.h
+++ b/src/kernel/mds_client.h
@@ -63,6 +63,7 @@ struct ceph_mds_client {
        struct radix_tree_root  request_tree;  /* pending mds requests */
        __u64                   last_requested_map;
        struct completion       map_waiters;
+       struct delayed_work     delayed_work;  /* delayed work */
 };
 
 /*
@@ -94,6 +95,7 @@ struct ceph_mds_reply_info {
 
 
 extern void ceph_mdsc_init(struct ceph_mds_client *mdsc, struct ceph_client *client);
+extern void ceph_mdsc_stop(struct ceph_mds_client *mdsc);
 
 extern void ceph_mdsc_handle_map(struct ceph_mds_client *mdsc, struct ceph_msg *msg);
 extern void ceph_mdsc_handle_session(struct ceph_mds_client *mdsc, struct ceph_msg *msg);

diff --git a/src/kernel/mdsmap.c b/src/kernel/mdsmap.c
index 27d6e491e6a512bd6a4e9aaf5cf867a86624c4e2..2d27ab00cb804a2903e8e8527fc3fbedfe0807be 100644 (file)
--- a/src/kernel/mdsmap.c
+++ b/src/kernel/mdsmap.c
@@ -43,7 +43,6 @@ int ceph_mdsmap_get_random_mds(struct ceph_mdsmap *m)
        return i;
 }
 
-
 struct ceph_entity_addr *ceph_mdsmap_get_addr(struct ceph_mdsmap *m, int w)
 {
        if (w >= m->m_max_mds)