74b1de
From 52d71ad0e5c27808e7d8eea8a0920298837e408c Mon Sep 17 00:00:00 2001
74b1de
From: Xavi Hernandez <xhernandez@redhat.com>
74b1de
Date: Wed, 17 Jul 2019 14:50:22 +0200
74b1de
Subject: [PATCH 271/276] cluster/ec: fix EIO error for concurrent writes on
74b1de
 sparse files
74b1de
74b1de
EC doesn't allow concurrent writes on overlapping areas, they are
74b1de
serialized. However non-overlapping writes are serviced in parallel.
74b1de
When a write is not aligned, EC first needs to read the entire chunk
74b1de
from disk, apply the modified fragment and write it again.
74b1de
74b1de
The problem appears on sparse files because a write to an offset
74b1de
implicitly creates data on offsets below it (so, in some way, they
74b1de
are overlapping). For example, if a file is empty and we read 10 bytes
74b1de
from offset 10, read() will return 0 bytes. Now, if we write one byte
74b1de
at offset 1M and retry the same read, the system call will return 10
74b1de
bytes (all containing 0's).
74b1de
74b1de
So if we have two writes, the first one at offset 10 and the second one
74b1de
at offset 1M, EC will send both in parallel because they do not overlap.
74b1de
However, the first one will try to read missing data from the first chunk
74b1de
(i.e. offsets 0 to 9) to recombine the entire chunk and do the final write.
74b1de
This read will happen in parallel with the write to 1M. What could happen
74b1de
is that half of the bricks process the write before the read, and the
74b1de
half do the read before the write. Some bricks will return 10 bytes of
74b1de
data while the otherw will return 0 bytes (because the file on the brick
74b1de
has not been expanded yet).
74b1de
74b1de
When EC tries to recombine the answers from the bricks, it can't, because
74b1de
it needs more than half consistent answers to recover the data. So this
74b1de
read fails with EIO error. This error is propagated to the parent write,
74b1de
which is aborted and EIO is returned to the application.
74b1de
74b1de
The issue happened because EC assumed that a write to a given offset
74b1de
implies that offsets below it exist.
74b1de
74b1de
This fix prevents the read of the chunk from bricks if the current size
74b1de
of the file is smaller than the read chunk offset. This size is
74b1de
correctly tracked, so this fixes the issue.
74b1de
74b1de
Also modifying ec-stripe.t file for Test #13 within it.
74b1de
In this patch, if a file size is less than the offset we are writing, we
74b1de
fill zeros in head and tail and do not consider it strip cache miss.
74b1de
That actually make sense as we know what data that part holds and there is
74b1de
no need of reading it from bricks.
74b1de
74b1de
Upstream-patch: https://review.gluster.org/c/glusterfs/+/23066
74b1de
Change-Id: Ic342e8c35c555b8534109e9314c9a0710b6225d6
74b1de
fixes: bz#1731448
74b1de
Signed-off-by: Xavi Hernandez <xhernandez@redhat.com>
74b1de
Reviewed-on: https://code.engineering.redhat.com/gerrit/177975
74b1de
Tested-by: RHGS Build Bot <nigelb@redhat.com>
74b1de
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
74b1de
---
74b1de
 tests/basic/ec/ec-stripe.t              |  2 +-
74b1de
 xlators/cluster/ec/src/ec-inode-write.c | 26 +++++++++++++++++---------
74b1de
 2 files changed, 18 insertions(+), 10 deletions(-)
74b1de
74b1de
diff --git a/tests/basic/ec/ec-stripe.t b/tests/basic/ec/ec-stripe.t
74b1de
index 1e940eb..98b9229 100644
74b1de
--- a/tests/basic/ec/ec-stripe.t
74b1de
+++ b/tests/basic/ec/ec-stripe.t
74b1de
@@ -202,7 +202,7 @@ TEST truncate -s 0 $B0/test_file
74b1de
 TEST truncate -s 0 $M0/test_file
74b1de
 TEST dd if=$B0/misc_file of=$B0/test_file  bs=1022 count=5  oflag=seek_bytes,sync seek=400 conv=notrunc
74b1de
 TEST dd if=$B0/misc_file of=$M0/test_file  bs=1022 count=5  oflag=seek_bytes,sync seek=400 conv=notrunc
74b1de
-check_statedump_md5sum 4 5
74b1de
+check_statedump_md5sum 4 4
74b1de
 clean_file_unmount
74b1de
 
74b1de
 ### 14 - Truncate to invalidate  all but one the stripe in cache  ####
74b1de
diff --git a/xlators/cluster/ec/src/ec-inode-write.c b/xlators/cluster/ec/src/ec-inode-write.c
74b1de
index ea55140..a45e6d6 100644
74b1de
--- a/xlators/cluster/ec/src/ec-inode-write.c
74b1de
+++ b/xlators/cluster/ec/src/ec-inode-write.c
74b1de
@@ -2013,20 +2013,28 @@ ec_writev_start(ec_fop_data_t *fop)
74b1de
     if (err != 0) {
74b1de
         goto failed_fd;
74b1de
     }
74b1de
+    tail = fop->size - fop->user_size - fop->head;
74b1de
     if (fop->head > 0) {
74b1de
-        found_stripe = ec_get_and_merge_stripe(ec, fop, EC_STRIPE_HEAD);
74b1de
-        if (!found_stripe) {
74b1de
-            if (ec_make_internal_fop_xdata(&xdata)) {
74b1de
-                err = -ENOMEM;
74b1de
-                goto failed_xdata;
74b1de
+        if (current > fop->offset) {
74b1de
+            found_stripe = ec_get_and_merge_stripe(ec, fop, EC_STRIPE_HEAD);
74b1de
+            if (!found_stripe) {
74b1de
+                if (ec_make_internal_fop_xdata(&xdata)) {
74b1de
+                    err = -ENOMEM;
74b1de
+                    goto failed_xdata;
74b1de
+                }
74b1de
+                ec_readv(fop->frame, fop->xl, -1, EC_MINIMUM_MIN,
74b1de
+                         ec_writev_merge_head, NULL, fd, ec->stripe_size,
74b1de
+                         fop->offset, 0, xdata);
74b1de
+            }
74b1de
+        } else {
74b1de
+            memset(fop->vector[0].iov_base, 0, fop->head);
74b1de
+            memset(fop->vector[0].iov_base + fop->size - tail, 0, tail);
74b1de
+            if (ec->stripe_cache && (fop->size <= ec->stripe_size)) {
74b1de
+                ec_add_stripe_in_cache(ec, fop);
74b1de
             }
74b1de
-            ec_readv(fop->frame, fop->xl, -1, EC_MINIMUM_MIN,
74b1de
-                     ec_writev_merge_head, NULL, fd, ec->stripe_size,
74b1de
-                     fop->offset, 0, xdata);
74b1de
         }
74b1de
     }
74b1de
 
74b1de
-    tail = fop->size - fop->user_size - fop->head;
74b1de
     if ((tail > 0) && ((fop->head == 0) || (fop->size > ec->stripe_size))) {
74b1de
         /* Current locking scheme will make sure the 'current' below will
74b1de
          * never decrease while the fop is in progress, so the checks will
74b1de
-- 
74b1de
1.8.3.1
74b1de