diff options
| author | Sage Weil <sage@inktank.com> | 2012-07-30 16:21:17 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-17 08:51:17 -0800 |
| commit | a2d928ffc91d237f178d769943bc785f1a7f7435 (patch) | |
| tree | 2f1da2117dc112e62b334d38a9b2643ebc92a9e4 | |
| parent | 627e242990064e050cf09436c46d66ccf0f8a6b9 (diff) | |
| download | linux-3.10-a2d928ffc91d237f178d769943bc785f1a7f7435.tar.gz linux-3.10-a2d928ffc91d237f178d769943bc785f1a7f7435.tar.bz2 linux-3.10-a2d928ffc91d237f178d769943bc785f1a7f7435.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>
(cherry picked from commit a53aab645c82f0146e35684b34692c69b5118121)
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/ceph/mds_client.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 7f1682da29a..95708dd092f 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c @@ -2528,6 +2528,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)); |