Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7a9e5dd authored by Sage Weil's avatar Sage Weil
Browse files

libceph: set peer name on con_open, not init 



The peer name may change on each open attempt, even when the connection is
reused.

Signed-off-by: default avatarSage Weil <sage@inktank.com>
parent 26103021

fs/ceph/mds_client.c

+4 −3
Original line number Diff line number Diff line
@@ -394,8 +394,7 @@ static struct ceph_mds_session *register_session(struct ceph_mds_client *mdsc, 
	s->s_seq = 0;

	mutex_init(&s->s_mutex);



	ceph_con_init(&s->s_con, s, &mds_con_ops, &mdsc->fsc->client->msgr,

		CEPH_ENTITY_TYPE_MDS, mds);

	ceph_con_init(&s->s_con, s, &mds_con_ops, &mdsc->fsc->client->msgr);



	spin_lock_init(&s->s_gen_ttl_lock);

	s->s_cap_gen = 0;
@@ -437,7 +436,8 @@ static struct ceph_mds_session *register_session(struct ceph_mds_client *mdsc, 
	mdsc->sessions[mds] = s;

	atomic_inc(&s->s_ref);  /* one ref to sessions[], one to caller */



	ceph_con_open(&s->s_con, ceph_mdsmap_get_addr(mdsc->mdsmap, mds));

	ceph_con_open(&s->s_con, CEPH_ENTITY_TYPE_MDS, mds,

		      ceph_mdsmap_get_addr(mdsc->mdsmap, mds));



	return s;
@@ -2529,6 +2529,7 @@ static void send_mds_reconnect(struct ceph_mds_client *mdsc, 
	session->s_seq = 0;



	ceph_con_open(&session->s_con,

		      CEPH_ENTITY_TYPE_MDS, mds,

		      ceph_mdsmap_get_addr(mdsc->mdsmap, mds));



	/* replay unsafe requests */

include/linux/ceph/messenger.h

+2 −2
Original line number Diff line number Diff line
@@ -232,9 +232,9 @@ extern void ceph_messenger_init(struct ceph_messenger *msgr, 


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

			const struct ceph_connection_operations *ops,

			struct ceph_messenger *msgr, __u8 entity_type,

			__u64 entity_num);

			struct ceph_messenger *msgr);

extern void ceph_con_open(struct ceph_connection *con,

			  __u8 entity_type, __u64 entity_num,

			  struct ceph_entity_addr *addr);

extern bool ceph_con_opened(struct ceph_connection *con);

extern void ceph_con_close(struct ceph_connection *con);

net/ceph/messenger.c

+7 −5
Original line number Diff line number Diff line
@@ -523,12 +523,17 @@ EXPORT_SYMBOL(ceph_con_close); 
/*

 * Reopen a closed connection, with a new peer address.

 */

void ceph_con_open(struct ceph_connection *con, struct ceph_entity_addr *addr)

void ceph_con_open(struct ceph_connection *con,

		   __u8 entity_type, __u64 entity_num,

		   struct ceph_entity_addr *addr)

{

	dout("con_open %p %s\n", con, ceph_pr_addr(&addr->in_addr));

	set_bit(OPENING, &con->state);

	WARN_ON(!test_and_clear_bit(CLOSED, &con->state));



	con->peer_name.type = (__u8) entity_type;

	con->peer_name.num = cpu_to_le64(entity_num);



	memcpy(&con->peer_addr, addr, sizeof(*addr));

	con->delay = 0;      /* reset backoff memory */

	queue_con(con);
@@ -548,7 +553,7 @@ bool ceph_con_opened(struct ceph_connection *con) 
 */

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

	const struct ceph_connection_operations *ops,

	struct ceph_messenger *msgr, __u8 entity_type, __u64 entity_num)

	struct ceph_messenger *msgr)

{

	dout("con_init %p\n", con);

	memset(con, 0, sizeof(*con));
@@ -558,9 +563,6 @@ void ceph_con_init(struct ceph_connection *con, void *private, 


	con_sock_state_init(con);



	con->peer_name.type = (__u8) entity_type;

	con->peer_name.num = cpu_to_le64(entity_num);



	mutex_init(&con->mutex);

	INIT_LIST_HEAD(&con->out_queue);

	INIT_LIST_HEAD(&con->out_sent);

net/ceph/mon_client.c

+2 −2
Original line number Diff line number Diff line
@@ -143,11 +143,11 @@ static int __open_session(struct ceph_mon_client *monc) 
		monc->want_next_osdmap = !!monc->want_next_osdmap;



		ceph_con_init(&monc->con, monc, &mon_con_ops,

			&monc->client->msgr,

			CEPH_ENTITY_TYPE_MON, monc->cur_mon);

			&monc->client->msgr);



		dout("open_session mon%d opening\n", monc->cur_mon);

		ceph_con_open(&monc->con,

			      CEPH_ENTITY_TYPE_MON, monc->cur_mon,

			      &monc->monmap->mon_inst[monc->cur_mon].addr);



		/* initiatiate authentication handshake */

net/ceph/osd_client.c

+6 −4
Original line number Diff line number Diff line
@@ -639,8 +639,7 @@ static struct ceph_osd *create_osd(struct ceph_osd_client *osdc, int onum) 
	INIT_LIST_HEAD(&osd->o_osd_lru);

	osd->o_incarnation = 1;



	ceph_con_init(&osd->o_con, osd, &osd_con_ops, &osdc->client->msgr,

		CEPH_ENTITY_TYPE_OSD, onum);

	ceph_con_init(&osd->o_con, osd, &osd_con_ops, &osdc->client->msgr);



	INIT_LIST_HEAD(&osd->o_keepalive_item);

	return osd;
@@ -750,7 +749,8 @@ static int __reset_osd(struct ceph_osd_client *osdc, struct ceph_osd *osd) 
		ret = -EAGAIN;

	} else {

		ceph_con_close(&osd->o_con);

		ceph_con_open(&osd->o_con, &osdc->osdmap->osd_addr[osd->o_osd]);

		ceph_con_open(&osd->o_con, CEPH_ENTITY_TYPE_OSD, osd->o_osd,

			      &osdc->osdmap->osd_addr[osd->o_osd]);

		osd->o_incarnation++;

	}

	return ret;
@@ -1005,7 +1005,9 @@ static int __map_request(struct ceph_osd_client *osdc, 
		dout("map_request osd %p is osd%d\n", req->r_osd, o);

		__insert_osd(osdc, req->r_osd);



		ceph_con_open(&req->r_osd->o_con, &osdc->osdmap->osd_addr[o]);

		ceph_con_open(&req->r_osd->o_con,

			      CEPH_ENTITY_TYPE_OSD, o,

			      &osdc->osdmap->osd_addr[o]);

	}



	if (req->r_osd) {