From bdec7d133963bb94528bfbf5c47dd1eb08bf4b35 Mon Sep 17 00:00:00 2001 From: Raghavendra G Date: Wed, 2 Sep 2009 04:54:23 +0000 Subject: performance/write-behind: communicate back the errors in writes to servers, in the next immediate writes from application. Signed-off-by: Anand V. Avati BUG: 242 (If any of the writes fail, write-behind should not wait till the fd is closed for reporting errors) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=242 --- xlators/performance/write-behind/src/write-behind.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'xlators/performance/write-behind/src/write-behind.c') diff --git a/xlators/performance/write-behind/src/write-behind.c b/xlators/performance/write-behind/src/write-behind.c index ae1792e07e1..83ff8d220b7 100644 --- a/xlators/performance/write-behind/src/write-behind.c +++ b/xlators/performance/write-behind/src/write-behind.c @@ -1659,6 +1659,7 @@ wb_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iovec *vector, wb_local_t *local = NULL; wb_request_t *request = NULL; int32_t ret = -1; + int32_t op_ret = -1, op_errno = -1; if (vector != NULL) size = iov_length (vector, count); @@ -1682,7 +1683,12 @@ wb_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iovec *vector, LOCK (&file->lock); { - if (file->disabled || file->disable_till) { + op_ret = file->op_ret; + op_errno = file->op_errno; + + file->op_ret = 0; + + if ((op_ret == 0) && (file->disabled || file->disable_till)) { if (size > file->disable_till) { file->disable_till = 0; } else { @@ -1693,6 +1699,11 @@ wb_writev (call_frame_t *frame, xlator_t *this, fd_t *fd, struct iovec *vector, } UNLOCK (&file->lock); + if (op_ret == -1) { + STACK_UNWIND (frame, op_ret, op_errno, NULL); + return 0; + } + if (wb_disabled) { STACK_WIND (frame, wb_writev_cbk, FIRST_CHILD (frame->this), -- cgit