kclient: use single ceph_connection over lifetime on monc

This avoids reallocation on each mon failure, reconnect.

diff --git a/src/kernel/mon_client.c b/src/kernel/mon_client.c
index 8987ffa1f47e2aa8b75825c9735e8c3147d20d60..091f3f5b0a2c826b766574a41e5039743e065e27 100644 (file)
--- a/src/kernel/mon_client.c
+++ b/src/kernel/mon_client.c
@@ -96,9 +96,8 @@ static void __close_session(struct ceph_mon_client *monc)
 {
        if (monc->con) {
                dout("__close_session closing mon%d\n", monc->cur_mon);
-               monc->con->private = NULL;
-               monc->con->ops->put(monc->con);
-               monc->con = NULL;
+               ceph_con_close(monc->con);
+               monc->cur_mon = -1;
        }
 }
 
@@ -109,7 +108,7 @@ static int __open_session(struct ceph_mon_client *monc)
 {
        char r;
 
-       if (!monc->con) {
+       if (monc->cur_mon < 0) {
                get_random_bytes(&r, 1);
                monc->cur_mon = r % monc->monmap->num_mon;
                dout("open_session num=%d r=%d -> mon%d\n",
@@ -118,16 +117,7 @@ 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;
 
-               monc->con = kzalloc(sizeof(*monc->con), GFP_NOFS);
-               if (!monc->con) {
-                       pr_err("open_session mon%d ENOMEM\n", monc->cur_mon);
-                       return -ENOMEM;
-               }
-
-               dout("open_session mon%d opened\n", monc->cur_mon);
-               ceph_con_init(monc->client->msgr, monc->con);
-               monc->con->private = monc;
-               monc->con->ops = &mon_con_ops;
+               dout("open_session mon%d opening\n", monc->cur_mon);
                monc->con->peer_name.type = cpu_to_le32(CEPH_ENTITY_TYPE_MON);
                monc->con->peer_name.num = cpu_to_le32(monc->cur_mon);
                ceph_con_open(monc->con,
@@ -150,7 +140,7 @@ static void __schedule_delayed(struct ceph_mon_client *monc)
 {
        unsigned delay;
 
-       if (!monc->con || monc->want_mount || __sub_expired(monc))
+       if (monc->cur_mon < 0 || monc->want_mount || __sub_expired(monc))
                delay = 10 * HZ;
        else
                delay = 20 * HZ;
@@ -287,12 +277,22 @@ static void __request_mount(struct ceph_mon_client *monc)
        ceph_con_send(monc->con, msg);
 }
 
-void ceph_monc_request_mount(struct ceph_mon_client *monc)
+int ceph_monc_request_mount(struct ceph_mon_client *monc)
 {
+       if (!monc->con) {
+               monc->con = kzalloc(sizeof(*monc->con), GFP_KERNEL);
+               if (!monc->con)
+                       return -ENOMEM;
+               ceph_con_init(monc->client->msgr, monc->con);
+               monc->con->private = monc;
+               monc->con->ops = &mon_con_ops;
+       }
+
        mutex_lock(&monc->mutex);
        __request_mount(monc);
        __schedule_delayed(monc);
        mutex_unlock(&monc->mutex);
+       return 0;
 }
 
 /*
@@ -529,8 +529,10 @@ int ceph_monc_init(struct ceph_mon_client *monc, struct ceph_client *cl)
        monc->client = cl;
        monc->monmap = NULL;
        mutex_init(&monc->mutex);
+
        monc->con = NULL;
 
+       monc->cur_mon = -1;
        monc->hunting = false;  /* not really */
        monc->sub_renew_after = jiffies;
        monc->sub_sent = 0;
@@ -551,9 +553,16 @@ void ceph_monc_stop(struct ceph_mon_client *monc)
 {
        dout("stop\n");
        cancel_delayed_work_sync(&monc->delayed_work);
+
        mutex_lock(&monc->mutex);
        __close_session(monc);
+       if (monc->con) {
+               monc->con->private = NULL;
+               monc->con->ops->put(monc->con);
+               monc->con = NULL;
+       }
        mutex_unlock(&monc->mutex);
+
        kfree(monc->monmap);
 }
 
@@ -634,7 +643,6 @@ out:
        mutex_unlock(&monc->mutex);
 }
 
-
 const static struct ceph_connection_operations mon_con_ops = {
        .get = ceph_con_get,
        .put = ceph_con_put,

diff --git a/src/kernel/mon_client.h b/src/kernel/mon_client.h
index 382a3f22ebe6fd466821442354422857b76d7698..5d6994d105d46b0b03bc6c397b130bd380717f9b 100644 (file)
--- a/src/kernel/mon_client.h
+++ b/src/kernel/mon_client.h
@@ -92,7 +92,7 @@ extern int ceph_monc_got_osdmap(struct ceph_mon_client *monc, u32 have);
 
 extern void ceph_monc_request_next_osdmap(struct ceph_mon_client *monc);
 
-extern void ceph_monc_request_mount(struct ceph_mon_client *monc);
+extern int ceph_monc_request_mount(struct ceph_mon_client *monc);
 
 extern int ceph_monc_do_statfs(struct ceph_mon_client *monc,
                               struct ceph_statfs *buf);

diff --git a/src/kernel/super.c b/src/kernel/super.c
index 14485ec17ab886b4886233264831847ed1214963..9378abbfd3015fb9cbb260b1e75a8a6ebb788094 100644 (file)
--- a/src/kernel/super.c
+++ b/src/kernel/super.c
@@ -748,7 +748,10 @@ static int ceph_mount(struct ceph_client *client, struct vfsmount *mnt,
        }
 
        /* send mount request, and wait for mon, mds, and osd maps */
-       ceph_monc_request_mount(&client->monc);
+       err = ceph_monc_request_mount(&client->monc);
+       if (err < 0)
+               goto out;
+
        while (!have_mon_map(client) && !client->mount_err) {
                err = -EIO;
                if (timeout && time_after_eq(jiffies, started + timeout))