diff options
| author | Sage Weil | 2009-11-09 21:05:48 +0100 |
|---|---|---|
| committer | Sage Weil | 2009-11-09 21:06:07 +0100 |
| commit | 685f9a5d14194fc35db73e5e7370740ccc14b64a (patch) | |
| tree | 4c34ac2348149d91ad5e08cd105207810f0afdc9 /fs/ceph/mds_client.h | |
| parent | ceph: make CRUSH hash function a bucket property (diff) | |
| download | kernel-qcow2-linux-685f9a5d14194fc35db73e5e7370740ccc14b64a.tar.gz kernel-qcow2-linux-685f9a5d14194fc35db73e5e7370740ccc14b64a.tar.xz kernel-qcow2-linux-685f9a5d14194fc35db73e5e7370740ccc14b64a.zip | |
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.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/ceph/mds_client.h b/fs/ceph/mds_client.h index f566e9c84295..c0846b1c482b 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 */ |