Commit 20581c1f authored by Alex Elder's avatar Alex Elder Committed by Alex Elder

libceph: init monitor connection when opening

Hold off initializing a monitor client's connection until just
before it gets opened for use.
Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarSage Weil <sage@inktank.com>
parent ec87ef43
...@@ -119,6 +119,7 @@ static void __close_session(struct ceph_mon_client *monc) ...@@ -119,6 +119,7 @@ static void __close_session(struct ceph_mon_client *monc)
dout("__close_session closing mon%d\n", monc->cur_mon); dout("__close_session closing mon%d\n", monc->cur_mon);
ceph_con_revoke(&monc->con, monc->m_auth); ceph_con_revoke(&monc->con, monc->m_auth);
ceph_con_close(&monc->con); ceph_con_close(&monc->con);
monc->con.private = NULL;
monc->cur_mon = -1; monc->cur_mon = -1;
monc->pending_auth = 0; monc->pending_auth = 0;
ceph_auth_reset(monc->auth); ceph_auth_reset(monc->auth);
...@@ -141,9 +142,13 @@ static int __open_session(struct ceph_mon_client *monc) ...@@ -141,9 +142,13 @@ static int __open_session(struct ceph_mon_client *monc)
monc->sub_renew_after = jiffies; /* i.e., expired */ monc->sub_renew_after = jiffies; /* i.e., expired */
monc->want_next_osdmap = !!monc->want_next_osdmap; monc->want_next_osdmap = !!monc->want_next_osdmap;
dout("open_session mon%d opening\n", monc->cur_mon); ceph_con_init(&monc->client->msgr, &monc->con);
monc->con.private = monc;
monc->con.ops = &mon_con_ops;
monc->con.peer_name.type = CEPH_ENTITY_TYPE_MON; monc->con.peer_name.type = CEPH_ENTITY_TYPE_MON;
monc->con.peer_name.num = cpu_to_le64(monc->cur_mon); monc->con.peer_name.num = cpu_to_le64(monc->cur_mon);
dout("open_session mon%d opening\n", monc->cur_mon);
ceph_con_open(&monc->con, ceph_con_open(&monc->con,
&monc->monmap->mon_inst[monc->cur_mon].addr); &monc->monmap->mon_inst[monc->cur_mon].addr);
...@@ -760,10 +765,6 @@ int ceph_monc_init(struct ceph_mon_client *monc, struct ceph_client *cl) ...@@ -760,10 +765,6 @@ int ceph_monc_init(struct ceph_mon_client *monc, struct ceph_client *cl)
goto out; goto out;
/* connection */ /* connection */
ceph_con_init(&monc->client->msgr, &monc->con);
monc->con.private = monc;
monc->con.ops = &mon_con_ops;
/* authentication */ /* authentication */
monc->auth = ceph_auth_init(cl->options->name, monc->auth = ceph_auth_init(cl->options->name,
cl->options->key); cl->options->key);
...@@ -836,8 +837,6 @@ void ceph_monc_stop(struct ceph_mon_client *monc) ...@@ -836,8 +837,6 @@ void ceph_monc_stop(struct ceph_mon_client *monc)
mutex_lock(&monc->mutex); mutex_lock(&monc->mutex);
__close_session(monc); __close_session(monc);
monc->con.private = NULL;
mutex_unlock(&monc->mutex); mutex_unlock(&monc->mutex);
ceph_auth_destroy(monc->auth); ceph_auth_destroy(monc->auth);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment