summaryrefslogtreecommitdiffstats
path: root/xlators/cluster/afr
diff options
context:
space:
mode:
authorRavishankar N <ravishankar@redhat.com>2018-10-10 12:18:55 +0530
committerAmar Tumballi <amarts@redhat.com>2018-10-10 16:18:55 +0000
commit196b32423af9a5088056fe10ea22d01494670931 (patch)
tree4760872562d1e14d721dd6627378a204867f1be7 /xlators/cluster/afr
parent4da0d93f8703c7247fece9d9fb471742e6fd7c33 (diff)
afr: prevent winding inodelks twice for arbiter volumes
Problem: In an arbiter volume, if there is a pending data heal of a file only on arbiter brick, self-heal takes inodelks twice due to a code-bug but unlocks it only once, leaving behind a stale lock on the brick. This causes the next write to the file to hang. Fix: Fix the code-bug to take lock only once. This bug was introduced master with commit eb472d82a083883335bc494b87ea175ac43471ff Thanks to Pranith Kumar K <pkarampu@redhat.com> for finding the RCA. fixes: bz#1637802 Change-Id: I15ad969e10a6a3c4bd255e2948b6be6dcddc61e1 Signed-off-by: Ravishankar N <ravishankar@redhat.com>
Diffstat (limited to 'xlators/cluster/afr')
-rw-r--r--xlators/cluster/afr/src/afr-self-heal-data.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-data.c b/xlators/cluster/afr/src/afr-self-heal-data.c
index a3650a3b22d..8cd79c73aa4 100644
--- a/xlators/cluster/afr/src/afr-self-heal-data.c
+++ b/xlators/cluster/afr/src/afr-self-heal-data.c
@@ -731,7 +731,7 @@ restore_time:
afr_selfheal_restore_time(frame, this, fd->inode, source, healed_sinks,
locked_replies);
- if (!is_arbiter_the_only_sink || !empty_file) {
+ if (!is_arbiter_the_only_sink && !empty_file) {
ret = afr_selfheal_inodelk(frame, this, fd->inode, this->name, 0, 0,
data_lock);
if (ret < priv->child_count) {