summaryrefslogtreecommitdiff
path: root/fs/ceph/mds_client.h
diff options
context:
space:
mode:
authorSage Weil <sage@newdream.net>2009-11-09 12:05:48 -0800
committerSage Weil <sage@newdream.net>2009-11-09 12:06:07 -0800
commit685f9a5d14194fc35db73e5e7370740ccc14b64a (patch)
tree4c34ac2348149d91ad5e08cd105207810f0afdc9 /fs/ceph/mds_client.h
parentfb690390e305ea51e1883b105c7d3c52d7100ba5 (diff)
ceph: do not confuse stale and dead (unreconnected) caps
We were using the cap_gen to track both stale caps (caps that timed out due to temporarily losing touch with the mds) and dead caps that did not reconnect after an MDS failure. Introduce a recon_gen counter to track reconnections to restarted MDSs and kill dead caps based on that instead. Rename gen to cap_gen while we're at it to make it more clear which is which. Signed-off-by: Sage Weil <sage@newdream.net>
Diffstat (limited to 'fs/ceph/mds_client.h')
-rw-r--r--fs/ceph/mds_client.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h
index f566e9c8429..c0846b1c482 100644
--- a/fs/ceph/mds_client.h
+++ b/fs/ceph/mds_client.h
@@ -98,6 +98,8 @@ struct ceph_mds_session {
u64 s_seq; /* incoming msg seq # */
struct mutex s_mutex; /* serialize session messages */
+ int s_recon_gen; /* inc on reconnect to recovered mds */
+
struct ceph_connection s_con;
/* protected by s_cap_lock */