commit b7a9e5dd40f17a48a72f249b8bbc989b63bae5fd
author Sage Weil <sage@inktank.com> Wed Jun 27 12:24:08 2012 -0700
committer Sage Weil <sage@inktank.com> Thu Jul 05 21:14:35 2012 -0700
tree f4951e53776e2ec45f9b539b786be67c8a7f42a2
parent 261030215d970c62f799e6e508e3c68fc7ec2aa9

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: Sage Weil <sage@inktank.com>

net/ceph/mon_client.c

diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c
index e9db3de..bcc80a0 100644
--- a/net/ceph/mon_client.c
+++ b/net/ceph/mon_client.c
@@ -143,11 +143,11 @@
 		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 */