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/server/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/server/src')
| -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 | 
4 files changed, 207 insertions, 0 deletions
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},  };  | 
