summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Wareing <rwareing@fb.com>2015-11-30 17:45:30 -0800
committerJeff Darcy <jeff@pl.atyp.us>2017-08-28 16:39:28 +0000
commitaf38bab4e6185f97f84fbfe096d85d8ec4727846 (patch)
treecf0239f3e3b7191b84425d5b6ff494c48701d083
parentda0c8c10dc693f75524d6d9f71af87db98f4eda0 (diff)
cluster/afr: Remove "compatability" code from SHD flow
Summary: - After examining some lock revocations, I recommend we remove this (problematic?) code which causes a lock to be held outside of the SHD locking domain. - The theory is that this lock should never conflict with anything outside of the SHD flow since the offsets are so huge. However in practice with lock revocation the lock lives a very long time, and I worry what the other implications of this might be. Test Plan: - Run tests/basic/afr/* (w/ D2706710) Reviewers: dph, moox, sshreyas Reviewed By: sshreyas Differential Revision: https://phabricator.fb.com/D2706717 Change-Id: I1f358f66810d104f28def9d1ac2a4fde3d073c92 Signed-off-by: Jeff Darcy <jdarcy@fb.com> Reviewed-on: https://review.gluster.org/18123 Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Jeff Darcy <jeff@pl.atyp.us> Tested-by: Jeff Darcy <jeff@pl.atyp.us> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-data.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c
index 98ee8059640..0b4d58dbabc 100644
--- a/xlators/cluster/afr/src/afr-self-heal-data.c
+++ b/xlators/cluster/afr/src/afr-self-heal-data.c
@@ -718,7 +718,6 @@ __afr_selfheal_data (call_frame_t *frame, xlator_t *this, fd_t *fd,
goto unlock;
ret = 0;
-
}
unlock:
afr_selfheal_uninodelk (frame, this, fd->inode, this->name, 0, 0,
@@ -754,7 +753,6 @@ skip_undo_pending:
afr_selfheal_uninodelk (frame, this, fd->inode, this->name, 0, 0,
data_lock);
out:
-
if (did_sh)
afr_log_selfheal (fd->inode->gfid, this, ret, "data", source,
sources, healed_sinks);