74b1de
From 546f412c155dd5aca2b3cd4202f80c9977b215dc Mon Sep 17 00:00:00 2001
74b1de
From: Pranith Kumar K <pkarampu@redhat.com>
74b1de
Date: Wed, 4 Sep 2019 12:06:34 +0530
74b1de
Subject: [PATCH 287/297] cluster/ec: Fail fsync/flush for files on update
74b1de
 size/version failure
74b1de
74b1de
Problem:
74b1de
If update size/version is not successful on the file, updates on the
74b1de
same stripe could lead to data corruptions if the earlier un-aligned
74b1de
write is not successful on all the bricks. Application won't have
74b1de
any knowledge of this because update size/version happens in the
74b1de
background.
74b1de
74b1de
Fix:
74b1de
Fail fsync/flush on fds that are opened before update-size-version
74b1de
went bad.
74b1de
74b1de
Upstream-patch: https://review.gluster.org/c/glusterfs/+/23355
74b1de
fixes: bz#1745107
74b1de
Change-Id: I9d323eddcda703bd27d55f340c4079d76e06e492
74b1de
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
74b1de
Reviewed-on: https://code.engineering.redhat.com/gerrit/180672
74b1de
Tested-by: RHGS Build Bot <nigelb@redhat.com>
74b1de
Reviewed-by: Ashish Pandey <aspandey@redhat.com>
74b1de
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
74b1de
---
74b1de
 tests/basic/ec/ec-badfd.c            | 124 +++++++++++++++++++++++++++++++++++
74b1de
 tests/basic/ec/ec-badfd.t            |  26 ++++++++
74b1de
 xlators/cluster/ec/src/ec-common.c   |  23 +++++++
74b1de
 xlators/cluster/ec/src/ec-generic.c  |  47 +++++++++++++
74b1de
 xlators/cluster/ec/src/ec-helpers.c  |   7 ++
74b1de
 xlators/cluster/ec/src/ec-messages.h |   2 +-
74b1de
 xlators/cluster/ec/src/ec-types.h    |   2 +
74b1de
 7 files changed, 230 insertions(+), 1 deletion(-)
74b1de
 create mode 100644 tests/basic/ec/ec-badfd.c
74b1de
 create mode 100755 tests/basic/ec/ec-badfd.t
74b1de
74b1de
diff --git a/tests/basic/ec/ec-badfd.c b/tests/basic/ec/ec-badfd.c
74b1de
new file mode 100644
74b1de
index 0000000..8be23c1
74b1de
--- /dev/null
74b1de
+++ b/tests/basic/ec/ec-badfd.c
74b1de
@@ -0,0 +1,124 @@
74b1de
+#include <stdio.h>
74b1de
+#include <fcntl.h>
74b1de
+#include <unistd.h>
74b1de
+#include <time.h>
74b1de
+#include <limits.h>
74b1de
+#include <string.h>
74b1de
+#include <stdlib.h>
74b1de
+#include <errno.h>
74b1de
+#include <glusterfs/api/glfs.h>
74b1de
+#include <glusterfs/api/glfs-handles.h>
74b1de
+
74b1de
+int
74b1de
+fill_iov(struct iovec *iov, char fillchar, int count)
74b1de
+{
74b1de
+    int ret = -1;
74b1de
+
74b1de
+    iov->iov_base = malloc(count + 1);
74b1de
+    if (iov->iov_base == NULL) {
74b1de
+        return ret;
74b1de
+    } else {
74b1de
+        iov->iov_len = count;
74b1de
+        ret = 0;
74b1de
+    }
74b1de
+    memset(iov->iov_base, fillchar, count);
74b1de
+    memset(iov->iov_base + count, '\0', 1);
74b1de
+
74b1de
+    return ret;
74b1de
+}
74b1de
+
74b1de
+int
74b1de
+write_sync(glfs_t *fs, glfs_fd_t *glfd, int char_count)
74b1de
+{
74b1de
+    ssize_t ret = -1;
74b1de
+    int flags = O_RDWR;
74b1de
+    struct iovec iov = {0};
74b1de
+
74b1de
+    ret = fill_iov(&iov, 'a', char_count);
74b1de
+    if (ret) {
74b1de
+        fprintf(stderr, "failed to create iov");
74b1de
+        goto out;
74b1de
+    }
74b1de
+
74b1de
+    ret = glfs_pwritev(glfd, &iov, 1, 0, flags);
74b1de
+out:
74b1de
+    if (ret < 0) {
74b1de
+        fprintf(stderr, "glfs_pwritev failed, %d", errno);
74b1de
+    }
74b1de
+    return ret;
74b1de
+}
74b1de
+
74b1de
+int
74b1de
+main(int argc, char *argv[])
74b1de
+{
74b1de
+    glfs_t *fs = NULL;
74b1de
+    glfs_fd_t *fd = NULL;
74b1de
+    int ret = 1;
74b1de
+    char volume_cmd[4096] = {0};
74b1de
+
74b1de
+    if (argc != 4) {
74b1de
+        fprintf(stderr, "Syntax: %s <host> <volname> <file>\n", argv[0]);
74b1de
+        return 1;
74b1de
+    }
74b1de
+
74b1de
+    fs = glfs_new(argv[2]);
74b1de
+    if (!fs) {
74b1de
+        fprintf(stderr, "glfs_new: returned NULL\n");
74b1de
+        return 1;
74b1de
+    }
74b1de
+
74b1de
+    ret = glfs_set_volfile_server(fs, "tcp", argv[1], 24007);
74b1de
+    if (ret != 0) {
74b1de
+        fprintf(stderr, "glfs_set_volfile_server: returned %d\n", ret);
74b1de
+        goto out;
74b1de
+    }
74b1de
+    ret = glfs_set_logging(fs, "/tmp/ec-badfd.log", 7);
74b1de
+    if (ret != 0) {
74b1de
+        fprintf(stderr, "glfs_set_logging: returned %d\n", ret);
74b1de
+        goto out;
74b1de
+    }
74b1de
+    ret = glfs_init(fs);
74b1de
+    if (ret != 0) {
74b1de
+        fprintf(stderr, "glfs_init: returned %d\n", ret);
74b1de
+        goto out;
74b1de
+    }
74b1de
+
74b1de
+    fd = glfs_open(fs, argv[3], O_RDWR);
74b1de
+    if (fd == NULL) {
74b1de
+        fprintf(stderr, "glfs_open: returned NULL\n");
74b1de
+        goto out;
74b1de
+    }
74b1de
+
74b1de
+    ret = write_sync(fs, fd, 16);
74b1de
+    if (ret < 0) {
74b1de
+        fprintf(stderr, "write_sync failed\n");
74b1de
+    }
74b1de
+
74b1de
+    snprintf(volume_cmd, sizeof(volume_cmd),
74b1de
+             "gluster --mode=script volume stop %s", argv[2]);
74b1de
+    /*Stop the volume so that update-size-version fails*/
74b1de
+    system(volume_cmd);
74b1de
+    sleep(8); /* 3 seconds more than eager-lock-timeout*/
74b1de
+    snprintf(volume_cmd, sizeof(volume_cmd),
74b1de
+             "gluster --mode=script volume start %s", argv[2]);
74b1de
+    system(volume_cmd);
74b1de
+    sleep(8); /*wait for bricks to come up*/
74b1de
+    ret = glfs_fsync(fd, NULL, NULL);
74b1de
+    if (ret == 0) {
74b1de
+        fprintf(stderr, "fsync succeeded on a BADFD\n");
74b1de
+        exit(1);
74b1de
+    }
74b1de
+
74b1de
+    ret = glfs_close(fd);
74b1de
+    if (ret == 0) {
74b1de
+        fprintf(stderr, "flush succeeded on a BADFD\n");
74b1de
+        exit(1);
74b1de
+    }
74b1de
+    ret = 0;
74b1de
+
74b1de
+out:
74b1de
+    unlink("/tmp/ec-badfd.log");
74b1de
+    glfs_fini(fs);
74b1de
+
74b1de
+    return ret;
74b1de
+}
74b1de
diff --git a/tests/basic/ec/ec-badfd.t b/tests/basic/ec/ec-badfd.t
74b1de
new file mode 100755
74b1de
index 0000000..56feb47
74b1de
--- /dev/null
74b1de
+++ b/tests/basic/ec/ec-badfd.t
74b1de
@@ -0,0 +1,26 @@
74b1de
+#!/bin/bash
74b1de
+
74b1de
+. $(dirname $0)/../../include.rc
74b1de
+. $(dirname $0)/../../volume.rc
74b1de
+
74b1de
+cleanup;
74b1de
+
74b1de
+TEST glusterd
74b1de
+TEST pidof glusterd
74b1de
+
74b1de
+TEST $CLI volume create $V0 disperse 6 redundancy 2 $H0:$B0/${V0}{1..6}
74b1de
+TEST $CLI volume set $V0 performance.write-behind off
74b1de
+TEST $CLI volume set $V0 disperse.eager-lock-timeout 5
74b1de
+
74b1de
+TEST $CLI volume start $V0
74b1de
+EXPECT 'Started' volinfo_field $V0 'Status'
74b1de
+
74b1de
+TEST $GFS -s $H0 --volfile-id $V0 $M0
74b1de
+EXPECT_WITHIN $CHILD_UP_TIMEOUT "6" ec_child_up_count $V0 0
74b1de
+TEST touch $M0/file
74b1de
+
74b1de
+TEST build_tester $(dirname $0)/ec-badfd.c -lgfapi -Wall -O2
74b1de
+TEST $(dirname $0)/ec-badfd $H0 $V0 /file
74b1de
+cleanup_tester $(dirname ${0})/ec-badfd
74b1de
+
74b1de
+cleanup;
74b1de
diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c
74b1de
index 5fb4610..92d4e5d 100644
74b1de
--- a/xlators/cluster/ec/src/ec-common.c
74b1de
+++ b/xlators/cluster/ec/src/ec-common.c
74b1de
@@ -2255,6 +2255,23 @@ ec_unlock_lock(ec_lock_link_t *link)
74b1de
     }
74b1de
 }
74b1de
 
74b1de
+void
74b1de
+ec_inode_bad_inc(inode_t *inode, xlator_t *xl)
74b1de
+{
74b1de
+    ec_inode_t *ctx = NULL;
74b1de
+
74b1de
+    LOCK(&inode->lock);
74b1de
+    {
74b1de
+        ctx = __ec_inode_get(inode, xl);
74b1de
+        if (ctx == NULL) {
74b1de
+            goto unlock;
74b1de
+        }
74b1de
+        ctx->bad_version++;
74b1de
+    }
74b1de
+unlock:
74b1de
+    UNLOCK(&inode->lock);
74b1de
+}
74b1de
+
74b1de
 int32_t
74b1de
 ec_update_size_version_done(call_frame_t *frame, void *cookie, xlator_t *this,
74b1de
                             int32_t op_ret, int32_t op_errno, dict_t *xattr,
74b1de
@@ -2270,6 +2287,12 @@ ec_update_size_version_done(call_frame_t *frame, void *cookie, xlator_t *this,
74b1de
     ctx = lock->ctx;
74b1de
 
74b1de
     if (op_ret < 0) {
74b1de
+        if (link->lock->fd == NULL) {
74b1de
+            ec_inode_bad_inc(link->lock->loc.inode, this);
74b1de
+        } else {
74b1de
+            ec_inode_bad_inc(link->lock->fd->inode, this);
74b1de
+        }
74b1de
+
74b1de
         gf_msg(fop->xl->name, fop_log_level(fop->id, op_errno), op_errno,
74b1de
                EC_MSG_SIZE_VERS_UPDATE_FAIL,
74b1de
                "Failed to update version and size. %s", ec_msg_str(fop));
74b1de
diff --git a/xlators/cluster/ec/src/ec-generic.c b/xlators/cluster/ec/src/ec-generic.c
74b1de
index acc16b5..b019050 100644
74b1de
--- a/xlators/cluster/ec/src/ec-generic.c
74b1de
+++ b/xlators/cluster/ec/src/ec-generic.c
74b1de
@@ -150,6 +150,37 @@ ec_manager_flush(ec_fop_data_t *fop, int32_t state)
74b1de
     }
74b1de
 }
74b1de
 
74b1de
+static int32_t
74b1de
+ec_validate_fd(fd_t *fd, xlator_t *xl)
74b1de
+{
74b1de
+    uint64_t iversion = 0;
74b1de
+    uint64_t fversion = 0;
74b1de
+    ec_inode_t *inode_ctx = NULL;
74b1de
+    ec_fd_t *fd_ctx = NULL;
74b1de
+
74b1de
+    LOCK(&fd->lock);
74b1de
+    {
74b1de
+        fd_ctx = __ec_fd_get(fd, xl);
74b1de
+        if (fd_ctx) {
74b1de
+            fversion = fd_ctx->bad_version;
74b1de
+        }
74b1de
+    }
74b1de
+    UNLOCK(&fd->lock);
74b1de
+
74b1de
+    LOCK(&fd->inode->lock);
74b1de
+    {
74b1de
+        inode_ctx = __ec_inode_get(fd->inode, xl);
74b1de
+        if (inode_ctx) {
74b1de
+            iversion = inode_ctx->bad_version;
74b1de
+        }
74b1de
+    }
74b1de
+    UNLOCK(&fd->inode->lock);
74b1de
+    if (fversion < iversion) {
74b1de
+        return EBADF;
74b1de
+    }
74b1de
+    return 0;
74b1de
+}
74b1de
+
74b1de
 void
74b1de
 ec_flush(call_frame_t *frame, xlator_t *this, uintptr_t target,
74b1de
          uint32_t fop_flags, fop_flush_cbk_t func, void *data, fd_t *fd,
74b1de
@@ -165,6 +196,14 @@ ec_flush(call_frame_t *frame, xlator_t *this, uintptr_t target,
74b1de
     GF_VALIDATE_OR_GOTO(this->name, frame, out);
74b1de
     GF_VALIDATE_OR_GOTO(this->name, this->private, out);
74b1de
 
74b1de
+    error = ec_validate_fd(fd, this);
74b1de
+    if (error) {
74b1de
+        gf_msg(this->name, GF_LOG_ERROR, EBADF, EC_MSG_FD_BAD,
74b1de
+               "Failing %s on %s", gf_fop_list[GF_FOP_FLUSH],
74b1de
+               fd->inode ? uuid_utoa(fd->inode->gfid) : "");
74b1de
+        goto out;
74b1de
+    }
74b1de
+
74b1de
     fop = ec_fop_data_allocate(frame, this, GF_FOP_FLUSH, 0, target, fop_flags,
74b1de
                                ec_wind_flush, ec_manager_flush, callback, data);
74b1de
     if (fop == NULL) {
74b1de
@@ -381,6 +420,14 @@ ec_fsync(call_frame_t *frame, xlator_t *this, uintptr_t target,
74b1de
     GF_VALIDATE_OR_GOTO(this->name, frame, out);
74b1de
     GF_VALIDATE_OR_GOTO(this->name, this->private, out);
74b1de
 
74b1de
+    error = ec_validate_fd(fd, this);
74b1de
+    if (error) {
74b1de
+        gf_msg(this->name, GF_LOG_ERROR, EBADF, EC_MSG_FD_BAD,
74b1de
+               "Failing %s on %s", gf_fop_list[GF_FOP_FSYNC],
74b1de
+               fd->inode ? uuid_utoa(fd->inode->gfid) : "");
74b1de
+        goto out;
74b1de
+    }
74b1de
+
74b1de
     fop = ec_fop_data_allocate(frame, this, GF_FOP_FSYNC, 0, target, fop_flags,
74b1de
                                ec_wind_fsync, ec_manager_fsync, callback, data);
74b1de
     if (fop == NULL) {
74b1de
diff --git a/xlators/cluster/ec/src/ec-helpers.c b/xlators/cluster/ec/src/ec-helpers.c
74b1de
index 43f6e3b..baac001 100644
74b1de
--- a/xlators/cluster/ec/src/ec-helpers.c
74b1de
+++ b/xlators/cluster/ec/src/ec-helpers.c
74b1de
@@ -753,6 +753,7 @@ __ec_fd_get(fd_t *fd, xlator_t *xl)
74b1de
 {
74b1de
     int i = 0;
74b1de
     ec_fd_t *ctx = NULL;
74b1de
+    ec_inode_t *ictx = NULL;
74b1de
     uint64_t value = 0;
74b1de
     ec_t *ec = xl->private;
74b1de
 
74b1de
@@ -775,6 +776,12 @@ __ec_fd_get(fd_t *fd, xlator_t *xl)
74b1de
                 GF_FREE(ctx);
74b1de
                 return NULL;
74b1de
             }
74b1de
+            /* Only refering bad-version so no need for lock
74b1de
+             * */
74b1de
+            ictx = __ec_inode_get(fd->inode, xl);
74b1de
+            if (ictx) {
74b1de
+                ctx->bad_version = ictx->bad_version;
74b1de
+            }
74b1de
         }
74b1de
     } else {
74b1de
         ctx = (ec_fd_t *)(uintptr_t)value;
74b1de
diff --git a/xlators/cluster/ec/src/ec-messages.h b/xlators/cluster/ec/src/ec-messages.h
74b1de
index 7c28808..be86b37 100644
74b1de
--- a/xlators/cluster/ec/src/ec-messages.h
74b1de
+++ b/xlators/cluster/ec/src/ec-messages.h
74b1de
@@ -55,6 +55,6 @@ GLFS_MSGID(EC, EC_MSG_INVALID_CONFIG, EC_MSG_HEAL_FAIL,
74b1de
            EC_MSG_CONFIG_XATTR_INVALID, EC_MSG_EXTENSION, EC_MSG_EXTENSION_NONE,
74b1de
            EC_MSG_EXTENSION_UNKNOWN, EC_MSG_EXTENSION_UNSUPPORTED,
74b1de
            EC_MSG_EXTENSION_FAILED, EC_MSG_NO_GF, EC_MSG_MATRIX_FAILED,
74b1de
-           EC_MSG_DYN_CREATE_FAILED, EC_MSG_DYN_CODEGEN_FAILED);
74b1de
+           EC_MSG_DYN_CREATE_FAILED, EC_MSG_DYN_CODEGEN_FAILED, EC_MSG_FD_BAD);
74b1de
 
74b1de
 #endif /* !_EC_MESSAGES_H_ */
74b1de
diff --git a/xlators/cluster/ec/src/ec-types.h b/xlators/cluster/ec/src/ec-types.h
74b1de
index 1c295c0..f27f2ec 100644
74b1de
--- a/xlators/cluster/ec/src/ec-types.h
74b1de
+++ b/xlators/cluster/ec/src/ec-types.h
74b1de
@@ -150,6 +150,7 @@ struct _ec_fd {
74b1de
     loc_t loc;
74b1de
     uintptr_t open;
74b1de
     int32_t flags;
74b1de
+    uint64_t bad_version;
74b1de
     ec_fd_status_t fd_status[0];
74b1de
 };
74b1de
 
74b1de
@@ -180,6 +181,7 @@ struct _ec_inode {
74b1de
     uint64_t dirty[2];
74b1de
     struct list_head heal;
74b1de
     ec_stripe_list_t stripe_cache;
74b1de
+    uint64_t bad_version;
74b1de
 };
74b1de
 
74b1de
 typedef int32_t (*fop_heal_cbk_t)(call_frame_t *, void *, xlator_t *, int32_t,
74b1de
-- 
74b1de
1.8.3.1
74b1de