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 | |
| 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>
| -rw-r--r-- | libglusterfs/src/mem-types.h | 2 | ||||
| -rw-r--r-- | rpc/rpc-lib/src/protocol-common.h | 3 | ||||
| -rw-r--r-- | rpc/xdr/src/glusterfs3-xdr.x | 18 | ||||
| -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 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server-helpers.c | 71 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server-helpers.h | 6 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server-mem-types.h | 1 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server-rpc-fops.c | 129 | 
11 files changed, 436 insertions, 2 deletions
diff --git a/libglusterfs/src/mem-types.h b/libglusterfs/src/mem-types.h index 09d096b83f5..958de8bc634 100644 --- a/libglusterfs/src/mem-types.h +++ b/libglusterfs/src/mem-types.h @@ -165,6 +165,8 @@ enum gf_common_mem_types_ {          gf_mt_compound_req_t,          gf_mt_compound_rsp_t,          gf_common_mt_tw_timer_list, +        /*lock migration*/ +        gf_common_mt_lock_mig,          gf_common_mt_end  };  #endif diff --git a/rpc/rpc-lib/src/protocol-common.h b/rpc/rpc-lib/src/protocol-common.h index e711f33b00f..ae6189d2e9b 100644 --- a/rpc/rpc-lib/src/protocol-common.h +++ b/rpc/rpc-lib/src/protocol-common.h @@ -63,8 +63,9 @@ enum gf_fop_procnum {          GFS3_OP_SEEK,          GFS3_OP_COMPOUND,          GFS3_OP_LEASE, +        GFS3_OP_GETACTIVELK,          GFS3_OP_MAXVALUE, -} ; +};  enum gf_handshake_procnum {          GF_HNDSK_NULL, diff --git a/rpc/xdr/src/glusterfs3-xdr.x b/rpc/xdr/src/glusterfs3-xdr.x index 33f1a9357cf..f0c5f12301f 100644 --- a/rpc/xdr/src/glusterfs3-xdr.x +++ b/rpc/xdr/src/glusterfs3-xdr.x @@ -962,3 +962,21 @@ struct gfs3_compound_rsp {          compound_rsp  compound_rsp_array<>;          opaque        xdata<>;  }; + +struct gfs3_locklist { +        struct gf_proto_flock flock; +        string client_uid<>; +        struct gfs3_locklist *nextentry; +}; + +struct gfs3_getactivelk_rsp { +        int op_ret; +        int op_errno; +        struct gfs3_locklist *reply; +        opaque xdata<>; +}; + +struct gfs3_getactivelk_req { +        opaque gfid[16]; +        opaque xdata<>; +}; 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 */ diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c index e1cf4219817..146c13c3c2f 100644 --- a/xlators/protocol/server/src/server-helpers.c +++ b/xlators/protocol/server/src/server-helpers.c @@ -985,6 +985,77 @@ readdirp_rsp_cleanup (gfs3_readdirp_rsp *rsp)          return 0;  } +int +serialize_rsp_locklist (lock_migration_info_t *locklist, +                               gfs3_getactivelk_rsp *rsp) +{ +        lock_migration_info_t   *tmp    = NULL; +        gfs3_locklist           *trav   = NULL; +        gfs3_locklist           *prev   = NULL; +        int                     ret     = -1; + +        GF_VALIDATE_OR_GOTO ("server", locklist, out); +        GF_VALIDATE_OR_GOTO ("server", rsp, out); + +        list_for_each_entry (tmp, &locklist->list, list) { +                trav = GF_CALLOC (1, sizeof (*trav), gf_server_mt_lock_mig_t); +                if (!trav) +                        goto out; + +                switch (tmp->flock.l_type) { +                case F_RDLCK: +                        tmp->flock.l_type = GF_LK_F_RDLCK; +                        break; +                case F_WRLCK: +                        tmp->flock.l_type = GF_LK_F_WRLCK; +                        break; +                case F_UNLCK: +                        tmp->flock.l_type = GF_LK_F_UNLCK; +                        break; + +                default: +                        gf_msg (THIS->name, GF_LOG_ERROR, 0, PS_MSG_LOCK_ERROR, +                                "Unknown lock type: %"PRId32"!", +                                tmp->flock.l_type); +                        break; +                } + +                gf_proto_flock_from_flock (&trav->flock, &tmp->flock); + +                trav->client_uid = tmp->client_uid; + +                if (prev) +                        prev->nextentry = trav; +                else +                        rsp->reply = trav; + +                prev = trav; +                trav = NULL; +        } + +        ret = 0; +out: +        GF_FREE (trav); +        return ret; +} + +int +getactivelkinfo_rsp_cleanup (gfs3_getactivelk_rsp  *rsp) +{ +        gfs3_locklist  *prev = NULL; +        gfs3_locklist  *trav = NULL; + +        trav = rsp->reply; +        prev = trav; + +        while (trav) { +                trav = trav->nextentry; +                GF_FREE (prev); +                prev = trav; +        } + +        return 0; +}  int  gf_server_check_getxattr_cmd (call_frame_t *frame, const char *key) diff --git a/xlators/protocol/server/src/server-helpers.h b/xlators/protocol/server/src/server-helpers.h index 6cc5829e7df..78b4bf08343 100644 --- a/xlators/protocol/server/src/server-helpers.h +++ b/xlators/protocol/server/src/server-helpers.h @@ -62,4 +62,10 @@ int server_process_event_upcall (xlator_t *this, void *data);  inode_t *  server_inode_new (inode_table_t *itable, uuid_t gfid); +int +serialize_rsp_locklist (lock_migration_info_t *locklist, +                                                 gfs3_getactivelk_rsp *rsp); + +int +getactivelkinfo_rsp_cleanup (gfs3_getactivelk_rsp  *rsp);  #endif /* !_SERVER_HELPERS_H */ diff --git a/xlators/protocol/server/src/server-mem-types.h b/xlators/protocol/server/src/server-mem-types.h index 9e2fcbc645f..38921884e83 100644 --- a/xlators/protocol/server/src/server-mem-types.h +++ b/xlators/protocol/server/src/server-mem-types.h @@ -26,6 +26,7 @@ enum gf_server_mem_types_ {          gf_server_mt_volfile_ctx_t,          gf_server_mt_timer_data_t,          gf_server_mt_setvolume_rsp_t, +        gf_server_mt_lock_mig_t,          gf_server_mt_end,  };  #endif /* __SERVER_MEM_TYPES_H__ */ diff --git a/xlators/protocol/server/src/server-rpc-fops.c b/xlators/protocol/server/src/server-rpc-fops.c index adfeb6464c8..8a1b14bf7f6 100644 --- a/xlators/protocol/server/src/server-rpc-fops.c +++ b/xlators/protocol/server/src/server-rpc-fops.c @@ -3301,7 +3301,79 @@ err:          return 0;  } +static int +server_getactivelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, +                        int32_t op_ret, int32_t op_errno, +                        lock_migration_info_t *locklist, dict_t *xdata) +{ +        gfs3_getactivelk_rsp    rsp     = {0,}; +        server_state_t          *state  = NULL; +        rpcsvc_request_t        *req    = NULL; +        int                     ret     = 0; + +        state = CALL_STATE (frame); + +        GF_PROTOCOL_DICT_SERIALIZE (this, xdata, &rsp.xdata.xdata_val, +                                    rsp.xdata.xdata_len, op_errno, out); + +        if (op_ret < 0) { +                state = CALL_STATE (frame); + +                gf_msg (this->name, GF_LOG_INFO, +                        op_errno, 0, +                        "%"PRId64": GETACTIVELK %s (%s) ==> (%s)", +                        frame->root->unique, state->loc.path, +                        uuid_utoa (state->resolve.gfid), +                        strerror (op_errno)); + +                goto out; +        } + +        /* (op_ret == 0) means there are no locks on the file*/ +        if (op_ret > 0) { +                ret = serialize_rsp_locklist (locklist, &rsp); +                if (ret == -1) { +                        op_ret   = -1; +                        op_errno = ENOMEM; +                        goto out; +                } +        } +out: +        rsp.op_ret    = op_ret; +        rsp.op_errno  = gf_errno_to_error (op_errno); + +        req = frame->local; + +        server_submit_reply (frame, req, &rsp, NULL, 0, NULL, +                             (xdrproc_t)xdr_gfs3_getactivelk_rsp); + +        GF_FREE (rsp.xdata.xdata_val); + +        getactivelkinfo_rsp_cleanup (&rsp); + +        return 0; +} + +int +server_getactivelk_resume (call_frame_t *frame, xlator_t *bound_xl) +{ +        server_state_t *state = NULL; + +        state = CALL_STATE (frame); + +        if (state->resolve.op_ret != 0) +                goto err; + +        STACK_WIND (frame, server_getactivelk_cbk, bound_xl, +                    bound_xl->fops->getactivelk, &state->loc, state->xdata); +        return 0; +err: +        server_getactivelk_cbk (frame, NULL, frame->this, state->resolve.op_ret, +                                state->resolve.op_errno, NULL, NULL); +        return 0; + +}  /* Fop section */ @@ -6517,6 +6589,62 @@ out:          return ret;  } +static int +server3_3_getactivelk (rpcsvc_request_t *req) +{ +        server_state_t          *state          = NULL; +        call_frame_t            *frame          = NULL; +        gfs3_getactivelk_req   args            = {{0,},}; +        size_t                  headers_size    = 0; +        int                     ret             = -1; +        int                     op_errno        = 0; + +        if (!req) +                return ret; + +        ret = xdr_to_generic (req->msg[0], &args, +                              (xdrproc_t)xdr_gfs3_getactivelk_req); +        if (ret < 0) { +                SERVER_REQ_SET_ERROR (req, ret); +                goto out; +        } + +        frame = get_frame_from_request (req); +        if (!frame) { +                SERVER_REQ_SET_ERROR (req, ret); +                goto out; +        } +        frame->root->op = GF_FOP_GETACTIVELK; + +        state = CALL_STATE (frame); +        if (!frame->root->client->bound_xl) { +                SERVER_REQ_SET_ERROR (req, ret); +                goto out; +        } + +        state->resolve.type = RESOLVE_MUST; +        memcpy (state->resolve.gfid, args.gfid, 16); + +        /* here, dict itself works as xdata */ +        GF_PROTOCOL_DICT_UNSERIALIZE (frame->root->client->bound_xl, +                                      state->xdata, +                                      (args.xdata.xdata_val), +                                      (args.xdata.xdata_len), ret, +                                      op_errno, out); + + +        ret = 0; +        resolve_and_resume (frame, server_getactivelk_resume); +out: +        free (args.xdata.xdata_val); + +        if (op_errno) +                SERVER_REQ_SET_ERROR (req, ret); + +        free (args.xdata.xdata_val); + +        return ret; +}  rpcsvc_actor_t glusterfs3_3_fop_actors[GLUSTER_FOP_PROCCNT] = {          [GFS3_OP_NULL]         = {"NULL",         GFS3_OP_NULL,         server_null,            NULL, 0, DRC_NA}, @@ -6569,6 +6697,7 @@ rpcsvc_actor_t glusterfs3_3_fop_actors[GLUSTER_FOP_PROCCNT] = {          [GFS3_OP_IPC]          = {"IPC",          GFS3_OP_IPC,          server3_3_ipc,          NULL, 0, DRC_NA},          [GFS3_OP_SEEK]         = {"SEEK",         GFS3_OP_SEEK,         server3_3_seek,         NULL, 0, DRC_NA},          [GFS3_OP_LEASE]       =  {"LEASE",        GFS3_OP_LEASE,        server3_3_lease,        NULL, 0, DRC_NA}, +        [GFS3_OP_GETACTIVELK] = {"GETACTIVELK", GFS3_OP_GETACTIVELK, server3_3_getactivelk, NULL, 0, DRC_NA},  };  | 
