summaryrefslogtreecommitdiffstats
path: root/fs/ceph
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-07-30 16:21:17 -0700
committerSage Weil <sage@inktank.com>2012-07-30 18:15:32 -0700
commita53aab645c82f0146e35684b34692c69b5118121 (patch)
treec066e9d7a670af46a2282d88c4a8a51912a98c7c /fs/ceph
parenta4107026976f06c9a6ce8cc84a763564ee39d901 (diff)
downloadlinux-stable-a53aab645c82f0146e35684b34692c69b5118121.tar.gz
linux-stable-a53aab645c82f0146e35684b34692c69b5118121.tar.bz2
linux-stable-a53aab645c82f0146e35684b34692c69b5118121.zip
ceph: close old con before reopening on mds reconnect
When we detect a mds session reset, close the old ceph_connection before reopening it. This ensures we clean up the old socket properly and keep the ceph_connection state correct. Signed-off-by: Sage Weil <sage@inktank.com> Reviewed-by: Alex Elder <elder@inktank.com> Reviewed-by: Yehuda Sadeh <yehuda@inktank.com>
Diffstat (limited to 'fs/ceph')
-rw-r--r--fs/ceph/mds_client.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c
index 39b76d66bc5d..a5a735422aa7 100644
--- a/fs/ceph/mds_client.c
+++ b/fs/ceph/mds_client.c
@@ -2518,6 +2518,7 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc,
session->s_state = CEPH_MDS_SESSION_RECONNECTING;
session->s_seq = 0;
+ ceph_con_close(&session->s_con);
ceph_con_open(&session->s_con,
CEPH_ENTITY_TYPE_MDS, mds,
ceph_mdsmap_get_addr(mdsc->mdsmap, mds));