diff options
| author | Alex Elder <elder@inktank.com> | 2012-05-26 23:26:43 -0500 |
|---|---|---|
| committer | Alex Elder <elder@dreamhost.com> | 2012-06-06 09:23:54 -0500 |
| commit | 20581c1faf7b15ae1f8b80c0ec757877b0b53151 (patch) | |
| tree | b2d0a20386c8fa6ae6bddbc6da1f313570889f66 /net/ceph | |
| parent | ec87ef4309d33bd9c87a53bb5152a86ae7a65f25 (diff) | |
| download | linux-3.10-20581c1faf7b15ae1f8b80c0ec757877b0b53151.tar.gz linux-3.10-20581c1faf7b15ae1f8b80c0ec757877b0b53151.tar.bz2 linux-3.10-20581c1faf7b15ae1f8b80c0ec757877b0b53151.zip | |
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: Alex Elder <elder@inktank.com>
Reviewed-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'net/ceph')
| -rw-r--r-- | net/ceph/mon_client.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/net/ceph/mon_client.c b/net/ceph/mon_client.c index 062b7247807..6adbea78b16 100644 --- a/net/ceph/mon_client.c +++ b/net/ceph/mon_client.c @@ -119,6 +119,7 @@ static void __close_session(struct ceph_mon_client *monc) dout("__close_session closing mon%d\n", monc->cur_mon); ceph_con_revoke(&monc->con, monc->m_auth); ceph_con_close(&monc->con); + monc->con.private = NULL; monc->cur_mon = -1; monc->pending_auth = 0; ceph_auth_reset(monc->auth); @@ -141,9 +142,13 @@ static int __open_session(struct ceph_mon_client *monc) monc->sub_renew_after = jiffies; /* i.e., expired */ 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.num = cpu_to_le64(monc->cur_mon); + + dout("open_session mon%d opening\n", monc->cur_mon); ceph_con_open(&monc->con, &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) goto out; /* connection */ - ceph_con_init(&monc->client->msgr, &monc->con); - monc->con.private = monc; - monc->con.ops = &mon_con_ops; - /* authentication */ monc->auth = ceph_auth_init(cl->options->name, cl->options->key); @@ -836,8 +837,6 @@ void ceph_monc_stop(struct ceph_mon_client *monc) mutex_lock(&monc->mutex); __close_session(monc); - monc->con.private = NULL; - mutex_unlock(&monc->mutex); ceph_auth_destroy(monc->auth); |