50dc83
From a0661449cd8ba7b851fec473191733767f4541b8 Mon Sep 17 00:00:00 2001
50dc83
From: Pranith Kumar K <pkarampu@redhat.com>
50dc83
Date: Thu, 28 Mar 2019 17:55:54 +0530
50dc83
Subject: [PATCH 46/52] protocol/client: Do not fallback to anon-fd if fd is
50dc83
 not open
50dc83
50dc83
If an open comes on a file when a brick is down and after the brick comes up,
50dc83
a fop comes on the fd, client xlator would still wind the fop on anon-fd
50dc83
leading to wrong behavior of the fops in some cases.
50dc83
50dc83
Example:
50dc83
If lk fop is issued on the fd just after the brick is up in the scenario above,
50dc83
lk fop will be sent on anon-fd instead of failing it on that client xlator.
50dc83
This lock will never be freed upon close of the fd as flush on anon-fd is
50dc83
invalid and is not wound below server xlator.
50dc83
50dc83
As a fix, failing the fop unless the fd has FALLBACK_TO_ANON_FD flag.
50dc83
50dc83
 >Upstream-patch: https://review.gluster.org/c/glusterfs/+/15804
50dc83
 >Change-Id: I77692d056660b2858e323bdabdfe0a381807cccc
50dc83
 >fixes bz#1390914
50dc83
50dc83
BUG: 1695057
50dc83
Change-Id: Id656bea8dde14327212fbe7ecc97519dc5b32098
50dc83
Signed-off-by: Pranith Kumar K <pkarampu@redhat.com>
50dc83
Reviewed-on: https://code.engineering.redhat.com/gerrit/166833
50dc83
Tested-by: RHGS Build Bot <nigelb@redhat.com>
50dc83
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
50dc83
---
50dc83
 tests/bugs/protocol/bug-1390914.t            | 36 ++++++++++++++++++++++++++++
50dc83
 xlators/protocol/client/src/client-helpers.c |  8 ++++++-
50dc83
 2 files changed, 43 insertions(+), 1 deletion(-)
50dc83
 create mode 100644 tests/bugs/protocol/bug-1390914.t
50dc83
50dc83
diff --git a/tests/bugs/protocol/bug-1390914.t b/tests/bugs/protocol/bug-1390914.t
50dc83
new file mode 100644
50dc83
index 0000000..e3dab92
50dc83
--- /dev/null
50dc83
+++ b/tests/bugs/protocol/bug-1390914.t
50dc83
@@ -0,0 +1,36 @@
50dc83
+#!/bin/bash
50dc83
+
50dc83
+. $(dirname $0)/../../include.rc
50dc83
+. $(dirname $0)/../../volume.rc
50dc83
+. $(dirname $0)/../../fileio.rc
50dc83
+cleanup;
50dc83
+
50dc83
+#test that fops are not wound on anon-fd when fd is not open on that brick
50dc83
+TEST glusterd;
50dc83
+TEST pidof glusterd
50dc83
+
50dc83
+TEST $CLI volume create $V0 replica 3 $H0:$B0/${V0}{1,2,3};
50dc83
+TEST $CLI volume set $V0 performance.open-behind off
50dc83
+TEST $CLI volume set $V0 diagnostics.client-log-level DEBUG
50dc83
+TEST $CLI volume heal $V0 disable
50dc83
+TEST $CLI volume start $V0
50dc83
+TEST $CLI volume profile $V0 start
50dc83
+TEST $GFS -s $H0 --volfile-id=$V0 --direct-io-mode=enable $M0;
50dc83
+
50dc83
+TEST touch $M0/1
50dc83
+TEST kill_brick $V0 $H0 $B0/${V0}1
50dc83
+TEST fd_open 200 'w' "$M0/1"
50dc83
+TEST $CLI volume start $V0 force
50dc83
+EXPECT_WITHIN $PROCESS_UP_TIMEOUT "1" afr_child_up_status $V0 0
50dc83
+
50dc83
+#lk should only happen on 2 bricks, if there is a bug, it will plant a lock
50dc83
+#with anon-fd on first-brick which will never be released because flush won't
50dc83
+#be wound below server xlator for anon-fd
50dc83
+TEST flock -x -n 200
50dc83
+TEST fd_close 200
50dc83
+
50dc83
+TEST fd_open 200 'w' "$M0/1"
50dc83
+#this lock will fail if there is a stale lock
50dc83
+TEST flock -x -n 200
50dc83
+TEST fd_close 200
50dc83
+cleanup;
50dc83
diff --git a/xlators/protocol/client/src/client-helpers.c b/xlators/protocol/client/src/client-helpers.c
50dc83
index 55e87b3..2dd7106 100644
50dc83
--- a/xlators/protocol/client/src/client-helpers.c
50dc83
+++ b/xlators/protocol/client/src/client-helpers.c
50dc83
@@ -419,7 +419,13 @@ client_get_remote_fd(xlator_t *this, fd_t *fd, int flags, int64_t *remote_fd)
50dc83
     {
50dc83
         fdctx = this_fd_get_ctx(fd, this);
50dc83
         if (!fdctx) {
50dc83
-            *remote_fd = GF_ANON_FD_NO;
50dc83
+            if (fd->anonymous) {
50dc83
+                *remote_fd = GF_ANON_FD_NO;
50dc83
+            } else {
50dc83
+                *remote_fd = -1;
50dc83
+                gf_msg_debug(this->name, EBADF, "not a valid fd for gfid: %s",
50dc83
+                             uuid_utoa(fd->inode->gfid));
50dc83
+            }
50dc83
         } else {
50dc83
             if (__is_fd_reopen_in_progress(fdctx))
50dc83
                 *remote_fd = -1;
50dc83
-- 
50dc83
1.8.3.1
50dc83