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