fix multiple transport related portmap issues in client handshake

Signed-off-by: Amar Tumballi <amar@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>

BUG: 2258 (enhance gluster volume rebalance)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=2258

2 files changed, 73 insertions, 1 deletions

diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c
index a6d8a480076..02b622f9884 100644
--- a/glusterfsd/src/glusterfsd-mgmt.c
+++ b/glusterfsd/src/glusterfsd-mgmt.c
@@ -546,12 +546,51 @@ out:
 
 
 static int
+mgmt_pmap_signin2_cbk (struct rpc_req *req, struct iovec *iov, int count,
+                       void *myframe)
+{
+        pmap_signin_rsp  rsp   = {0,};
+        call_frame_t    *frame = NULL;
+        int              ret   = 0;
+
+        frame = myframe;
+
+        if (-1 == req->rpc_status) {
+                rsp.op_ret   = -1;
+                rsp.op_errno = EINVAL;
+                goto out;
+        }
+
+        ret = xdr_to_pmap_signin_rsp (*iov, &rsp);
+        if (ret < 0) {
+                gf_log (frame->this->name, GF_LOG_ERROR, "XDR decode error");
+                rsp.op_ret   = -1;
+                rsp.op_errno = EINVAL;
+                goto out;
+        }
+
+        if (-1 == rsp.op_ret) {
+                gf_log (frame->this->name, GF_LOG_ERROR,
+                        "failed to register the port with glusterd");
+                goto out;
+        }
+out:
+        STACK_DESTROY (frame->root);
+        return 0;
+
+}
+
+static int
 mgmt_pmap_signin_cbk (struct rpc_req *req, struct iovec *iov, int count,
                       void *myframe)
 {
         pmap_signin_rsp  rsp   = {0,};
         call_frame_t    *frame = NULL;
         int              ret   = 0;
+        pmap_signin_req  pmap_req = {0, };
+        cmd_args_t      *cmd_args = NULL;
+        glusterfs_ctx_t *ctx      = NULL;
+        char             brick_name[PATH_MAX] = {0,};
 
         frame = myframe;
 
@@ -574,6 +613,27 @@ mgmt_pmap_signin_cbk (struct rpc_req *req, struct iovec *iov, int count,
                         "failed to register the port with glusterd");
                 goto out;
         }
+
+        ctx = glusterfs_ctx_get ();
+        cmd_args = &ctx->cmd_args;
+
+        if (!cmd_args->brick_port2) {
+                /* We are done with signin process */
+                goto out;
+        }
+
+        snprintf (brick_name, PATH_MAX, "%s.rdma", cmd_args->brick_name);
+        pmap_req.port  = cmd_args->brick_port2;
+        pmap_req.brick = brick_name;
+
+        ret = mgmt_submit_request (&pmap_req, frame, ctx, &clnt_pmap_prog,
+                                   GF_PMAP_SIGNIN, xdr_from_pmap_signin_req,
+                                   mgmt_pmap_signin2_cbk);
+        if (ret)
+                goto out;
+
+        return 0;
+
 out:
 
         STACK_DESTROY (frame->root);
diff --git a/glusterfsd/src/glusterfsd.c b/glusterfsd/src/glusterfsd.c
index 87d16c7dcf9..f17ac814eb9 100644
--- a/glusterfsd/src/glusterfsd.c
+++ b/glusterfsd/src/glusterfsd.c
@@ -426,6 +426,8 @@ parse_opts (int key, char *arg, struct argp_state *state)
         gf_boolean_t  b             = _gf_false;
         char         *pwd           = NULL;
         char          tmp_buf[2048] = {0,};
+        char         *tmp_str       = NULL;
+        char         *port_str      = NULL;
 
         cmd_args = state->input;
 
@@ -657,8 +659,18 @@ parse_opts (int key, char *arg, struct argp_state *state)
         case ARGP_BRICK_PORT_KEY:
                 n = 0;
 
-                if (gf_string2uint_base10 (arg, &n) == 0) {
+                port_str = strtok_r (arg, ",", &tmp_str);
+                if (gf_string2uint_base10 (port_str, &n) == 0) {
                         cmd_args->brick_port = n;
+                        port_str = strtok_r (NULL, ",", &tmp_str);
+                        if (port_str) {
+                                if (gf_string2uint_base10 (port_str, &n) == 0)
+                                        cmd_args->brick_port2 = n;
+                                break;
+
+                                argp_failure (state, -1, 0,
+                                              "wrong brick (listen) port %s", arg);
+                        }
                         break;
                 }