diff options
Diffstat (limited to 'xlators/performance/quick-read/src/quick-read.c')
| -rw-r--r-- | xlators/performance/quick-read/src/quick-read.c | 335 |
1 files changed, 220 insertions, 115 deletions
diff --git a/xlators/performance/quick-read/src/quick-read.c b/xlators/performance/quick-read/src/quick-read.c index fb7e67abc..bd9b47416 100644 --- a/xlators/performance/quick-read/src/quick-read.c +++ b/xlators/performance/quick-read/src/quick-read.c @@ -575,8 +575,6 @@ qr_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, local = frame->local; if (local != NULL) { - local->op_ret = op_ret; - local->op_errno = op_errno; is_open = local->is_open; } @@ -645,6 +643,8 @@ qr_open_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret, out: if (is_open) { QR_STACK_UNWIND (open, frame, op_ret, op_errno, fd); + } else { + STACK_DESTROY (frame->root); } return 0; @@ -882,6 +882,10 @@ qr_validate_cache_cbk (call_frame_t *frame, void *cookie, xlator_t *this, unwind: /* this is actually unwind of readv */ + if ((local != NULL) && (local->stub != NULL)) { + call_stub_destroy (local->stub); + } + QR_STACK_UNWIND (readv, frame, op_ret, op_errno, NULL, -1, NULL, NULL); return 0; } @@ -922,15 +926,16 @@ int qr_validate_cache (call_frame_t *frame, xlator_t *this, fd_t *fd, call_stub_t *stub) { - int ret = -1; - int flags = 0; - uint64_t value = 0; - loc_t loc = {0, }; - char *path = NULL; - qr_local_t *local = NULL; - qr_fd_ctx_t *qr_fd_ctx = NULL; - call_stub_t *validate_stub = NULL; - char need_open = 0, can_wind = 0; + int ret = -1; + int flags = 0; + uint64_t value = 0; + loc_t loc = {0, }; + char *path = NULL; + qr_local_t *local = NULL; + qr_fd_ctx_t *qr_fd_ctx = NULL; + call_stub_t *validate_stub = NULL; + char need_open = 0, can_wind = 0, validate_cbk_called = 0; + call_frame_t *open_frame = NULL; GF_ASSERT (frame); GF_VALIDATE_OR_GOTO (frame->this->name, this, out); @@ -975,7 +980,9 @@ qr_validate_cache (call_frame_t *frame, xlator_t *this, fd_t *fd, fd); if (validate_stub == NULL) { ret = -1; - qr_fd_ctx->open_in_transit = 0; + if (need_open) { + qr_fd_ctx->open_in_transit = 0; + } goto unlock; } @@ -994,13 +1001,22 @@ qr_validate_cache (call_frame_t *frame, xlator_t *this, fd_t *fd, } if (need_open) { + open_frame = create_frame (this, this->ctx->pool); + if (open_frame == NULL) { + qr_resume_pending_ops (qr_fd_ctx, -1, ENOMEM); + validate_cbk_called = 1; + goto out; + } + ret = qr_loc_fill (&loc, fd->inode, path); if (ret == -1) { qr_resume_pending_ops (qr_fd_ctx, -1, errno); + validate_cbk_called = 1; + STACK_DESTROY (open_frame->root); goto out; } - STACK_WIND (frame, qr_open_cbk, FIRST_CHILD(this), + STACK_WIND (open_frame, qr_open_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->open, &loc, flags, fd, qr_fd_ctx->wbflags); @@ -1012,6 +1028,13 @@ qr_validate_cache (call_frame_t *frame, xlator_t *this, fd_t *fd, ret = 0; out: + if ((ret < 0) && !validate_cbk_called) { + if (frame->local == NULL) { + call_stub_destroy (stub); + } + + qr_validate_cache_cbk (frame, NULL, this, -1, errno, NULL); + } return ret; } @@ -1096,6 +1119,7 @@ qr_readv (call_frame_t *frame, xlator_t *this, fd_t *fd, size_t size, char just_validated = 0; qr_private_t *priv = NULL; qr_inode_table_t *table = NULL; + call_frame_t *open_frame = NULL; op_ret = 0; @@ -1242,13 +1266,7 @@ out: goto out; } - op_ret = qr_validate_cache (frame, this, fd, stub); - if (op_ret == -1) { - need_unwind = 1; - op_errno = errno; - call_stub_destroy (stub); - goto out; - } + qr_validate_cache (frame, this, fd, stub); } else { if (qr_fd_ctx) { LOCK (&qr_fd_ctx->lock); @@ -1312,7 +1330,14 @@ out: goto ret; } - STACK_WIND (frame, qr_open_cbk, FIRST_CHILD(this), + open_frame = create_frame (this, this->ctx->pool); + if (open_frame == NULL) { + qr_resume_pending_ops (qr_fd_ctx, -1, ENOMEM); + qr_loc_wipe (&loc); + goto ret; + } + + STACK_WIND (open_frame, qr_open_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->open, &loc, flags, fd, qr_fd_ctx->wbflags); @@ -1396,17 +1421,18 @@ int32_t qr_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iovec *vector, int32_t count, off_t off, struct iobref *iobref) { - uint64_t value = 0; - int flags = 0; - call_stub_t *stub = NULL; - char *path = NULL; - loc_t loc = {0, }; - qr_inode_t *qr_inode = NULL; - qr_fd_ctx_t *qr_fd_ctx = NULL; - int32_t op_ret = -1, op_errno = -1, ret = -1; - char can_wind = 0, need_unwind = 0, need_open = 0; - qr_private_t *priv = NULL; - qr_inode_table_t *table = NULL; + uint64_t value = 0; + int flags = 0; + call_stub_t *stub = NULL; + char *path = NULL; + loc_t loc = {0, }; + qr_inode_t *qr_inode = NULL; + qr_fd_ctx_t *qr_fd_ctx = NULL; + int32_t op_ret = -1, op_errno = -1, ret = -1; + char can_wind = 0, need_unwind = 0, need_open = 0; + qr_private_t *priv = NULL; + qr_inode_table_t *table = NULL; + call_frame_t *open_frame = NULL; priv = this->private; table = &priv->table; @@ -1490,7 +1516,14 @@ qr_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iovec *vector, goto ret; } - STACK_WIND (frame, qr_open_cbk, FIRST_CHILD(this), + open_frame = create_frame (this, this->ctx->pool); + if (open_frame == NULL) { + qr_resume_pending_ops (qr_fd_ctx, -1, ENOMEM); + qr_loc_wipe (&loc); + goto ret; + } + + STACK_WIND (open_frame, qr_open_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->open, &loc, flags, fd, qr_fd_ctx->wbflags); @@ -1554,14 +1587,15 @@ unwind: int32_t qr_fstat (call_frame_t *frame, xlator_t *this, fd_t *fd) { - qr_fd_ctx_t *qr_fd_ctx = NULL; - char need_open = 0, can_wind = 0, need_unwind = 0; - uint64_t value = 0; - int32_t ret = -1, op_ret = -1, op_errno = EINVAL; - call_stub_t *stub = NULL; - loc_t loc = {0, }; - char *path = NULL; - int flags = 0; + qr_fd_ctx_t *qr_fd_ctx = NULL; + char need_open = 0, can_wind = 0, need_unwind = 0; + uint64_t value = 0; + int32_t ret = -1, op_ret = -1, op_errno = EINVAL; + call_stub_t *stub = NULL; + loc_t loc = {0, }; + char *path = NULL; + int flags = 0; + call_frame_t *open_frame = NULL; GF_ASSERT (frame); if ((this == NULL) || (fd == NULL)) { @@ -1636,7 +1670,14 @@ unwind: goto ret; } - STACK_WIND (frame, qr_open_cbk, FIRST_CHILD(this), + open_frame = create_frame (this, this->ctx->pool); + if (open_frame == NULL) { + qr_resume_pending_ops (qr_fd_ctx, -1, ENOMEM); + qr_loc_wipe (&loc); + goto ret; + } + + STACK_WIND (open_frame, qr_open_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->open, &loc, flags, fd, qr_fd_ctx->wbflags); @@ -1706,14 +1747,15 @@ int32_t qr_fsetattr (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iatt *stbuf, int32_t valid) { - uint64_t value = 0; - int flags = 0; - call_stub_t *stub = NULL; - char *path = NULL; - loc_t loc = {0, }; - qr_fd_ctx_t *qr_fd_ctx = NULL; - int32_t ret = -1, op_ret = -1, op_errno = EINVAL; - char need_open = 0, can_wind = 0, need_unwind = 0; + uint64_t value = 0; + int flags = 0; + call_stub_t *stub = NULL; + char *path = NULL; + loc_t loc = {0, }; + qr_fd_ctx_t *qr_fd_ctx = NULL; + int32_t ret = -1, op_ret = -1, op_errno = EINVAL; + char need_open = 0, can_wind = 0, need_unwind = 0; + call_frame_t *open_frame = NULL; GF_ASSERT (frame); if ((this == NULL) || (fd == NULL)) { @@ -1789,7 +1831,14 @@ out: goto ret; } - STACK_WIND (frame, qr_open_cbk, FIRST_CHILD(this), + open_frame = create_frame (this, this->ctx->pool); + if (open_frame == NULL) { + qr_resume_pending_ops (qr_fd_ctx, -1, ENOMEM); + qr_loc_wipe (&loc); + goto ret; + } + + STACK_WIND (open_frame, qr_open_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->open, &loc, flags, fd, qr_fd_ctx->wbflags); @@ -1857,14 +1906,15 @@ int32_t qr_fsetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd, dict_t *dict, int32_t flags) { - uint64_t value = 0; - call_stub_t *stub = NULL; - char *path = NULL; - loc_t loc = {0, }; - int open_flags = 0; - qr_fd_ctx_t *qr_fd_ctx = NULL; - int32_t ret = -1, op_ret = -1, op_errno = EINVAL; - char need_open = 0, can_wind = 0, need_unwind = 0; + uint64_t value = 0; + call_stub_t *stub = NULL; + char *path = NULL; + loc_t loc = {0, }; + int open_flags = 0; + qr_fd_ctx_t *qr_fd_ctx = NULL; + int32_t ret = -1, op_ret = -1, op_errno = EINVAL; + char need_open = 0, can_wind = 0, need_unwind = 0; + call_frame_t *open_frame = NULL; GF_ASSERT (frame); if ((this == NULL) || (fd == NULL)) { @@ -1941,7 +1991,14 @@ out: goto ret; } - STACK_WIND (frame, qr_open_cbk, FIRST_CHILD(this), + open_frame = create_frame (this, this->ctx->pool); + if (open_frame == NULL) { + qr_resume_pending_ops (qr_fd_ctx, -1, ENOMEM); + qr_loc_wipe (&loc); + goto ret; + } + + STACK_WIND (open_frame, qr_open_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->open, &loc, open_flags, fd, qr_fd_ctx->wbflags); @@ -2008,14 +2065,15 @@ unwind: int32_t qr_fgetxattr (call_frame_t *frame, xlator_t *this, fd_t *fd, const char *name) { - int flags = 0; - uint64_t value = 0; - call_stub_t *stub = NULL; - char *path = NULL; - loc_t loc = {0, }; - qr_fd_ctx_t *qr_fd_ctx = NULL; - int32_t ret = -1, op_ret = -1, op_errno = EINVAL; - char need_open = 0, can_wind = 0, need_unwind = 0; + int flags = 0; + uint64_t value = 0; + call_stub_t *stub = NULL; + char *path = NULL; + loc_t loc = {0, }; + qr_fd_ctx_t *qr_fd_ctx = NULL; + int32_t ret = -1, op_ret = -1, op_errno = EINVAL; + char need_open = 0, can_wind = 0, need_unwind = 0; + call_frame_t *open_frame = NULL; /* * FIXME: Can quick-read use the extended attributes stored in the @@ -2096,7 +2154,14 @@ out: goto ret; } - STACK_WIND (frame, qr_open_cbk, FIRST_CHILD(this), + open_frame = create_frame (this, this->ctx->pool); + if (open_frame == NULL) { + qr_resume_pending_ops (qr_fd_ctx, -1, ENOMEM); + qr_loc_wipe (&loc); + goto ret; + } + + STACK_WIND (open_frame, qr_open_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->open, &loc, flags, fd, qr_fd_ctx->wbflags); @@ -2291,14 +2356,15 @@ int32_t qr_fentrylk (call_frame_t *frame, xlator_t *this, const char *volume, fd_t *fd, const char *basename, entrylk_cmd cmd, entrylk_type type) { - int flags = 0; - uint64_t value = 0; - call_stub_t *stub = NULL; - char *path = NULL; - loc_t loc = {0, }; - qr_fd_ctx_t *qr_fd_ctx = NULL; - int32_t ret = -1, op_ret = -1, op_errno = EINVAL; - char need_open = 0, can_wind = 0, need_unwind = 0; + int flags = 0; + uint64_t value = 0; + call_stub_t *stub = NULL; + char *path = NULL; + loc_t loc = {0, }; + qr_fd_ctx_t *qr_fd_ctx = NULL; + int32_t ret = -1, op_ret = -1, op_errno = EINVAL; + char need_open = 0, can_wind = 0, need_unwind = 0; + call_frame_t *open_frame = NULL; if ((this == NULL) || (fd == NULL)) { gf_log (frame->this->name, GF_LOG_WARNING, @@ -2375,7 +2441,14 @@ out: goto ret; } - STACK_WIND (frame, qr_open_cbk, FIRST_CHILD(this), + open_frame = create_frame (this, this->ctx->pool); + if (open_frame == NULL) { + qr_resume_pending_ops (qr_fd_ctx, -1, ENOMEM); + qr_loc_wipe (&loc); + goto ret; + } + + STACK_WIND (open_frame, qr_open_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->open, &loc, flags, fd, qr_fd_ctx->wbflags); @@ -2444,14 +2517,15 @@ int32_t qr_finodelk (call_frame_t *frame, xlator_t *this, const char *volume, fd_t *fd, int32_t cmd, struct gf_flock *lock) { - int flags = 0; - uint64_t value = 0; - call_stub_t *stub = NULL; - char *path = NULL; - loc_t loc = {0, }; - qr_fd_ctx_t *qr_fd_ctx = NULL; - int32_t ret = -1, op_ret = -1, op_errno = EINVAL; - char need_open = 0, can_wind = 0, need_unwind = 0; + int flags = 0; + uint64_t value = 0; + call_stub_t *stub = NULL; + char *path = NULL; + loc_t loc = {0, }; + qr_fd_ctx_t *qr_fd_ctx = NULL; + int32_t ret = -1, op_ret = -1, op_errno = EINVAL; + char need_open = 0, can_wind = 0, need_unwind = 0; + call_frame_t *open_frame = NULL; if ((this == NULL) || (fd == NULL)) { gf_log (frame->this->name, GF_LOG_WARNING, @@ -2528,7 +2602,14 @@ out: goto ret; } - STACK_WIND (frame, qr_open_cbk, FIRST_CHILD(this), + open_frame = create_frame (this, this->ctx->pool); + if (open_frame == NULL) { + qr_resume_pending_ops (qr_fd_ctx, -1, ENOMEM); + qr_loc_wipe (&loc); + goto ret; + } + + STACK_WIND (open_frame, qr_open_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->open, &loc, flags, fd, qr_fd_ctx->wbflags); @@ -2593,14 +2674,15 @@ unwind: int32_t qr_fsync (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t flags) { - uint64_t value = 0; - call_stub_t *stub = NULL; - char *path = NULL; - loc_t loc = {0, }; - int open_flags = 0; - qr_fd_ctx_t *qr_fd_ctx = NULL; - int32_t ret = -1, op_ret = -1, op_errno = EINVAL; - char need_open = 0, can_wind = 0, need_unwind = 0; + uint64_t value = 0; + call_stub_t *stub = NULL; + char *path = NULL; + loc_t loc = {0, }; + int open_flags = 0; + qr_fd_ctx_t *qr_fd_ctx = NULL; + int32_t ret = -1, op_ret = -1, op_errno = EINVAL; + char need_open = 0, can_wind = 0, need_unwind = 0; + call_frame_t *open_frame = NULL; if ((this == NULL) || (fd == NULL)) { gf_log (frame->this->name, GF_LOG_WARNING, @@ -2674,7 +2756,14 @@ out: goto ret; } - STACK_WIND (frame, qr_open_cbk, FIRST_CHILD(this), + open_frame = create_frame (this, this->ctx->pool); + if (open_frame == NULL) { + qr_resume_pending_ops (qr_fd_ctx, -1, ENOMEM); + qr_loc_wipe (&loc); + goto ret; + } + + STACK_WIND (open_frame, qr_open_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->open, &loc, open_flags, fd, qr_fd_ctx->wbflags); @@ -2796,15 +2885,16 @@ unwind: int32_t qr_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset) { - int flags = 0; - uint64_t value = 0; - call_stub_t *stub = NULL; - char *path = NULL; - loc_t loc = {0, }; - qr_local_t *local = NULL; - qr_fd_ctx_t *qr_fd_ctx = NULL; - int32_t ret = -1, op_ret = -1, op_errno = EINVAL; - char need_open = 0, can_wind = 0, need_unwind = 0; + int flags = 0; + uint64_t value = 0; + call_stub_t *stub = NULL; + char *path = NULL; + loc_t loc = {0, }; + qr_local_t *local = NULL; + qr_fd_ctx_t *qr_fd_ctx = NULL; + int32_t ret = -1, op_ret = -1, op_errno = EINVAL; + char need_open = 0, can_wind = 0, need_unwind = 0; + call_frame_t *open_frame = NULL; GF_ASSERT (frame); if ((this == NULL) || (fd == NULL)) { @@ -2881,7 +2971,14 @@ out: goto ret; } - STACK_WIND (frame, qr_open_cbk, FIRST_CHILD(this), + open_frame = create_frame (this, this->ctx->pool); + if (open_frame == NULL) { + qr_resume_pending_ops (qr_fd_ctx, -1, ENOMEM); + qr_loc_wipe (&loc); + goto ret; + } + + STACK_WIND (open_frame, qr_open_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->open, &loc, flags, fd, qr_fd_ctx->wbflags); @@ -2949,14 +3046,15 @@ int32_t qr_lk (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd, struct gf_flock *lock) { - int flags = 0; - uint64_t value = 0; - call_stub_t *stub = NULL; - char *path = NULL; - loc_t loc = {0, }; - qr_fd_ctx_t *qr_fd_ctx = NULL; - int32_t ret = -1, op_ret = -1, op_errno = EINVAL; - char need_open = 0, can_wind = 0, need_unwind = 0; + int flags = 0; + uint64_t value = 0; + call_stub_t *stub = NULL; + char *path = NULL; + loc_t loc = {0, }; + qr_fd_ctx_t *qr_fd_ctx = NULL; + int32_t ret = -1, op_ret = -1, op_errno = EINVAL; + char need_open = 0, can_wind = 0, need_unwind = 0; + call_frame_t *open_frame = NULL; GF_ASSERT (frame); if ((this == NULL) || (fd == NULL)) { @@ -3031,7 +3129,14 @@ out: goto ret; } - STACK_WIND (frame, qr_open_cbk, FIRST_CHILD(this), + open_frame = create_frame (this, this->ctx->pool); + if (open_frame == NULL) { + qr_resume_pending_ops (qr_fd_ctx, -1, ENOMEM); + qr_loc_wipe (&loc); + goto ret; + } + + STACK_WIND (open_frame, qr_open_cbk, FIRST_CHILD(this), FIRST_CHILD(this)->fops->open, &loc, flags, fd, qr_fd_ctx->wbflags); |