Commit 120a75ea authored by Yan, Zheng's avatar Yan, Zheng Committed by Ilya Dryomov
Browse files

libceph: add function that reset client's entity addr 



This function also re-open connections to OSD/MON, and re-send in-flight
OSD requests after re-opening connections to OSD.

Signed-off-by: default avatar"Yan, Zheng" <zyan@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent e09580b3

include/linux/ceph/libceph.h

+1 −0
Original line number Diff line number Diff line
@@ -293,6 +293,7 @@ struct ceph_client *ceph_create_client(struct ceph_options *opt, void *private); 
struct ceph_entity_addr *ceph_client_addr(struct ceph_client *client);

u64 ceph_client_gid(struct ceph_client *client);

extern void ceph_destroy_client(struct ceph_client *client);

extern void ceph_reset_client_addr(struct ceph_client *client);

extern int __ceph_open_session(struct ceph_client *client,

			       unsigned long started);

extern int ceph_open_session(struct ceph_client *client);

include/linux/ceph/messenger.h

+1 −0
Original line number Diff line number Diff line
@@ -337,6 +337,7 @@ extern void ceph_msgr_flush(void); 
extern void ceph_messenger_init(struct ceph_messenger *msgr,

				struct ceph_entity_addr *myaddr);

extern void ceph_messenger_fini(struct ceph_messenger *msgr);

extern void ceph_messenger_reset_nonce(struct ceph_messenger *msgr);



extern void ceph_con_init(struct ceph_connection *con, void *private,

			const struct ceph_connection_operations *ops,

include/linux/ceph/mon_client.h

+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ extern int ceph_monmap_contains(struct ceph_monmap *m, 


extern int ceph_monc_init(struct ceph_mon_client *monc, struct ceph_client *cl);

extern void ceph_monc_stop(struct ceph_mon_client *monc);

extern void ceph_monc_reopen_session(struct ceph_mon_client *monc);



enum {

	CEPH_SUB_MONMAP = 0,

include/linux/ceph/osd_client.h

+1 −0
Original line number Diff line number Diff line
@@ -381,6 +381,7 @@ extern void ceph_osdc_cleanup(void); 
extern int ceph_osdc_init(struct ceph_osd_client *osdc,

			  struct ceph_client *client);

extern void ceph_osdc_stop(struct ceph_osd_client *osdc);

extern void ceph_osdc_reopen_osds(struct ceph_osd_client *osdc);



extern void ceph_osdc_handle_reply(struct ceph_osd_client *osdc,

				   struct ceph_msg *msg);

net/ceph/ceph_common.c

+8 −0
Original line number Diff line number Diff line
@@ -694,6 +694,14 @@ void ceph_destroy_client(struct ceph_client *client) 
}

EXPORT_SYMBOL(ceph_destroy_client);



void ceph_reset_client_addr(struct ceph_client *client)

{

	ceph_messenger_reset_nonce(&client->msgr);

	ceph_monc_reopen_session(&client->monc);

	ceph_osdc_reopen_osds(&client->osdc);

}

EXPORT_SYMBOL(ceph_reset_client_addr);



/*

 * true if we have the mon map (and have thus joined the cluster)

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE