d1681e
From 9408859ce233c84f94fe4b7dd73cbbdc09fac10c Mon Sep 17 00:00:00 2001
d1681e
From: Ashish Pandey <aspandey@redhat.com>
d1681e
Date: Thu, 2 Aug 2018 10:54:52 +0530
d1681e
Subject: [PATCH 335/351] cluster/ec: set others.eager-lock option off by
d1681e
 default
d1681e
d1681e
This patch is only for downstream.
d1681e
We will revert the changes back to ON once we take
d1681e
lock contention feature for downstream, which is already present
d1681e
in upstream.
d1681e
d1681e
Change-Id: I4619eb692fe66732d5373dd63afd28b44467027a
d1681e
BUG: 1611151
d1681e
Signed-off-by: Ashish Pandey <aspandey@redhat.com>
d1681e
Reviewed-on: https://code.engineering.redhat.com/gerrit/145842
d1681e
Tested-by: RHGS Build Bot <nigelb@redhat.com>
d1681e
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
d1681e
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
d1681e
---
d1681e
 xlators/cluster/ec/src/ec.c | 6 +++++-
d1681e
 1 file changed, 5 insertions(+), 1 deletion(-)
d1681e
d1681e
diff --git a/xlators/cluster/ec/src/ec.c b/xlators/cluster/ec/src/ec.c
d1681e
index 0d59efd..9a23a45 100644
d1681e
--- a/xlators/cluster/ec/src/ec.c
d1681e
+++ b/xlators/cluster/ec/src/ec.c
d1681e
@@ -1434,9 +1434,13 @@ struct volume_options options[] =
d1681e
                      "disabled, lock will be released as soon as fop "
d1681e
                      "completes."
d1681e
     },
d1681e
+    /* Keeping this option OFF by default. Once we take lock
d1681e
+     * contention notification feature (upstream patch #14736) in for
d1681e
+     * downstream we can revert this to ON.
d1681e
+     */
d1681e
     { .key = {"other-eager-lock"},
d1681e
       .type = GF_OPTION_TYPE_BOOL,
d1681e
-      .default_value = "on",
d1681e
+      .default_value = "off",
d1681e
       .description = "It's equivalent to the eager-lock option but for non "
d1681e
                      "regular files."
d1681e
     },
d1681e
-- 
d1681e
1.8.3.1
d1681e