diff options
| author | Susant Palai <spalai@redhat.com> | 2016-04-30 18:00:44 +0530 | 
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2016-05-01 18:04:31 -0700 | 
| commit | 2cca000fcc2adbffbb3f5258c57ae564b9e2d51f (patch) | |
| tree | 971db1740040b652d226987baf417a33bb8ab035 /xlators/protocol/client/src | |
| parent | c823603f5aab0a60eb076ea43b869739745d9f21 (diff) | |
protocol: add getactivelk () fop
Change-Id: Ie38198db990f133fe163ba160cdf647e34f83f4f
BUG: 1326085
Signed-off-by: Susant Palai <spalai@redhat.com>
Reviewed-on: http://review.gluster.org/13994
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Smoke: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/protocol/client/src')
| -rw-r--r-- | xlators/protocol/client/src/client-helpers.c | 56 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client-rpc-fops.c | 118 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client.c | 28 | ||||
| -rw-r--r-- | xlators/protocol/client/src/client.h | 6 | 
4 files changed, 207 insertions, 1 deletions
diff --git a/xlators/protocol/client/src/client-helpers.c b/xlators/protocol/client/src/client-helpers.c index e78242ffe65..c28a7cb4cbd 100644 --- a/xlators/protocol/client/src/client-helpers.c +++ b/xlators/protocol/client/src/client-helpers.c @@ -1750,3 +1750,59 @@ compound_request_cleanup (gfs3_compound_req *req)          return;  } + +void +clnt_getactivelk_rsp_cleanup (gfs3_getactivelk_rsp *rsp) +{ +        gfs3_locklist   *trav = NULL; +        gfs3_locklist   *next = NULL; + +        trav = rsp->reply; + +        while (trav) { +                next = trav->nextentry; +                free (trav->client_uid); +                free (trav); +                trav = next; +        } +} + +int +clnt_unserialize_rsp_locklist (xlator_t *this, struct gfs3_getactivelk_rsp *rsp, +                               lock_migration_info_t *lmi) +{ +        struct gfs3_locklist            *trav           = NULL; +        lock_migration_info_t           *temp           = NULL; +        char                            *buf            = NULL; +        int                             entry_len       = 0; +        int                             ret             = -1; +        clnt_conf_t                     *conf           = NULL; + +        trav = rsp->reply; + +        conf = this->private; +        if (!conf) +                goto out; + +        while (trav) { +                temp = GF_CALLOC (1, sizeof (*lmi), gf_common_mt_lock_mig); +                if (temp == NULL) { +                        gf_msg (this->name, GF_LOG_ERROR, 0, 0, "No memory"); +                        goto out; +                } + +                INIT_LIST_HEAD (&temp->list); + +                gf_proto_flock_to_flock (&trav->flock, &temp->flock); + +                temp->client_uid =  gf_strdup (trav->client_uid); + +                list_add_tail (&temp->list, &lmi->list); + +                trav = trav->nextentry; +        } + +        ret = 0; +out: +        return ret; +} diff --git a/xlators/protocol/client/src/client-rpc-fops.c b/xlators/protocol/client/src/client-rpc-fops.c index a80c9e610d8..3b4f1c45ed0 100644 --- a/xlators/protocol/client/src/client-rpc-fops.c +++ b/xlators/protocol/client/src/client-rpc-fops.c @@ -3029,6 +3029,70 @@ client3_3_releasedir_cbk (struct rpc_req *req, struct iovec *iov, int count,          return 0;  } +static int +client3_3_getactivelk_cbk (struct rpc_req *req, struct iovec *iov, int count, +                           void *myframe) +{ +        call_frame_t            *frame = NULL; +        gfs3_getactivelk_rsp   rsp   = {0,}; +        int32_t                 ret   = 0; +        clnt_local_t            *local = NULL; +        lock_migration_info_t   locklist; +        xlator_t                *this  = NULL; +        dict_t                  *xdata = NULL; + +        this = THIS; + +        frame = myframe; +        local = frame->local; + +        if (-1 == req->rpc_status) { +                rsp.op_ret   = -1; +                rsp.op_errno = ENOTCONN; +                goto out; +        } + +        ret = xdr_to_generic (*iov, &rsp, (xdrproc_t)xdr_gfs3_getactivelk_rsp); +        if (ret < 0) { +                gf_msg (this->name, GF_LOG_ERROR, EINVAL, +                        PC_MSG_XDR_DECODING_FAILED, "XDR decoding failed"); +                rsp.op_ret   = -1; +                rsp.op_errno = EINVAL; +                goto out; +        } + +        INIT_LIST_HEAD (&locklist.list); + +        if (rsp.op_ret > 0) { +                clnt_unserialize_rsp_locklist (this, &rsp, &locklist); +        } + +        GF_PROTOCOL_DICT_UNSERIALIZE (this, xdata, (rsp.xdata.xdata_val), +                                      (rsp.xdata.xdata_len), ret, +                                      rsp.op_errno, out); + +out: +        if (rsp.op_ret == -1) { +                gf_msg (this->name, GF_LOG_WARNING, +                        gf_error_to_errno (rsp.op_errno), +                        PC_MSG_REMOTE_OP_FAILED, +                        "remote operation failed"); +        } + +        CLIENT_STACK_UNWIND (getactivelk, frame, rsp.op_ret, +                             gf_error_to_errno (rsp.op_errno), &locklist, +                             xdata); + +        free (rsp.xdata.xdata_val); + +        if (xdata) +                dict_unref (xdata); + +        clnt_getactivelk_rsp_cleanup (&rsp); + +        return 0; +} +  int  client3_3_compound_cbk (struct rpc_req *req, struct iovec *iov, int count,                          void *myframe) @@ -6117,9 +6181,58 @@ unwind:          return 0;  } -/* Table Specific to FOPS */ +static int32_t +client3_3_getactivelk (call_frame_t *frame, xlator_t *this, +                        void *data) +{ +        clnt_conf_t   *conf             = NULL; +        clnt_args_t   *args             = NULL; +        gfs3_getactivelk_req  req      = {{0,},}; +        int            ret              = 0; +        int            op_errno         = ESTALE; + +        if (!frame || !this || !data) +                goto unwind; + +        args = data; +        if (!(args->loc && args->loc->inode)) +                goto unwind; + +        if (!gf_uuid_is_null (args->loc->inode->gfid)) +                memcpy (req.gfid,  args->loc->inode->gfid, 16); +        else +                memcpy (req.gfid, args->loc->gfid, 16); + +        GF_ASSERT_AND_GOTO_WITH_ERROR (this->name, +                                       !gf_uuid_is_null (*((uuid_t *)req.gfid)), +                                       unwind, op_errno, EINVAL); +        conf = this->private; + +        GF_PROTOCOL_DICT_SERIALIZE (this, args->xdata, (&req.xdata.xdata_val), +                                    req.xdata.xdata_len, op_errno, unwind); + +        ret = client_submit_request (this, &req, frame, conf->fops, +                                     GFS3_OP_GETACTIVELK, +                                     client3_3_getactivelk_cbk, NULL, +                                     NULL, 0, NULL, 0, NULL, +                                     (xdrproc_t)xdr_gfs3_getactivelk_req); +        if (ret) { +                gf_msg (this->name, GF_LOG_WARNING, 0, PC_MSG_FOP_SEND_FAILED, +                        "failed to send the fop"); +        } + +        GF_FREE (req.xdata.xdata_val); + +        return 0; +unwind: +        CLIENT_STACK_UNWIND (getactivelk, frame, -1, op_errno, NULL, NULL); + +        GF_FREE (req.xdata.xdata_val); +        return 0; +} +/* Table Specific to FOPS */  rpc_clnt_procedure_t clnt3_3_fop_actors[GF_FOP_MAXVALUE] = {          [GF_FOP_NULL]         = { "NULL",         NULL},          [GF_FOP_STAT]         = { "STAT",         client3_3_stat }, @@ -6172,6 +6285,8 @@ rpc_clnt_procedure_t clnt3_3_fop_actors[GF_FOP_MAXVALUE] = {          [GF_FOP_IPC]          = { "IPC",          client3_3_ipc },          [GF_FOP_SEEK]         = { "SEEK",         client3_3_seek },          [GF_FOP_LEASE]        = { "LEASE",        client3_3_lease }, +        [GF_FOP_GETACTIVELK]  = { "GETACTIVELK", client3_3_getactivelk}, +  };  /* Used From RPC-CLNT library to log proper name of procedure based on number */ @@ -6226,6 +6341,7 @@ char *clnt3_3_fop_names[GFS3_OP_MAXVALUE] = {          [GFS3_OP_IPC]         = "IPC",          [GFS3_OP_SEEK]        = "SEEK",          [GFS3_OP_LEASE]       = "LEASE", +        [GFS3_OP_GETACTIVELK] = "GETACTIVELK",  };  rpc_clnt_prog_t clnt3_3_fop_prog = { diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c index c37c1e25b44..4810f75ac25 100644 --- a/xlators/protocol/client/src/client.c +++ b/xlators/protocol/client/src/client.c @@ -2066,6 +2066,33 @@ out:          return 0;  } +int32_t +client_getactivelk (call_frame_t *frame, xlator_t *this, loc_t *loc, +                     dict_t *xdata) +{ +        int          ret                = -1; +        clnt_conf_t *conf               = NULL; +        rpc_clnt_procedure_t *proc      = NULL; +        clnt_args_t  args               = {0,}; + +        conf = this->private; +        if (!conf || !conf->fops) +                goto out; + + +        args.loc = loc; +        args.xdata = xdata; + +        proc = &conf->fops->proctable[GF_FOP_GETACTIVELK]; +        if (proc->fn) +                ret = proc->fn (frame, this, &args); +out: +        if (ret) +                STACK_UNWIND_STRICT (getactivelk, frame, -1, ENOTCONN, NULL, +                                     NULL); + +        return 0; +}  int32_t  client_getspec (call_frame_t *frame, xlator_t *this, const char *key, @@ -2893,6 +2920,7 @@ struct xlator_fops fops = {          .seek        = client_seek,          .lease       = client_lease,          .compound    = client_compound, +        .getactivelk = client_getactivelk,  }; diff --git a/xlators/protocol/client/src/client.h b/xlators/protocol/client/src/client.h index efa9d21437a..c12c45605b5 100644 --- a/xlators/protocol/client/src/client.h +++ b/xlators/protocol/client/src/client.h @@ -360,4 +360,10 @@ client_process_response (call_frame_t *frame, xlator_t *this,                           int index);  void  compound_request_cleanup (gfs3_compound_req *req); + +int +clnt_unserialize_rsp_locklist (xlator_t *this, struct gfs3_getactivelk_rsp *rsp, +                               lock_migration_info_t *lmi); +void +clnt_getactivelk_rsp_cleanup (gfs3_getactivelk_rsp *rsp);  #endif /* !_CLIENT_H */  | 
