d1681e
From 1425f0c723c7f3811a4104efdf3cb55f0bb02731 Mon Sep 17 00:00:00 2001
d1681e
From: Csaba Henk <csaba@redhat.com>
d1681e
Date: Fri, 15 Dec 2017 08:22:21 +0100
d1681e
Subject: [PATCH 112/128] write-behind: Allow trickling-writes to be
d1681e
 configurable
d1681e
d1681e
This is the undisputed/trivial part of Shreyas' patch
d1681e
he attached to https://bugzilla.redhat.com/1364740 (of
d1681e
which the current bug is a clone).
d1681e
d1681e
We need more evaluation for the page_size and window_size
d1681e
bits before taking them on.
d1681e
d1681e
> Change-Id: Iaa0b9a69d35e522b77a52a09acef47460e8ae3e9
d1681e
> BUG: 1428060
d1681e
> Co-authored-by: Shreyas Siravara <sshreyas@fb.com>
d1681e
> Signed-off-by: Csaba Henk <csaba@redhat.com>
d1681e
> Reviewed-on: https://review.gluster.org/18719
d1681e
d1681e
Change-Id: Iaa0b9a69d35e522b77a52a09acef47460e8ae3e9
d1681e
BUG: 1426042
d1681e
Co-authored-by: Shreyas Siravara <sshreyas@fb.com>
d1681e
Signed-off-by: Csaba Henk <csaba@redhat.com>
d1681e
Reviewed-on: https://code.engineering.redhat.com/gerrit/125932
d1681e
Tested-by: RHGS Build Bot <nigelb@redhat.com>
d1681e
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
d1681e
---
d1681e
 libglusterfs/src/globals.h                      |  4 +++-
d1681e
 xlators/mgmt/glusterd/src/glusterd-volume-set.c | 12 ++++++++++++
d1681e
 2 files changed, 15 insertions(+), 1 deletion(-)
d1681e
d1681e
diff --git a/libglusterfs/src/globals.h b/libglusterfs/src/globals.h
d1681e
index c627cfe..692d49d 100644
d1681e
--- a/libglusterfs/src/globals.h
d1681e
+++ b/libglusterfs/src/globals.h
d1681e
@@ -43,7 +43,7 @@
d1681e
  */
d1681e
 #define GD_OP_VERSION_MIN  1 /* MIN is the fresh start op-version, mostly
d1681e
                                 should not change */
d1681e
-#define GD_OP_VERSION_MAX  GD_OP_VERSION_3_13_0 /* MAX VERSION is the maximum
d1681e
+#define GD_OP_VERSION_MAX  GD_OP_VERSION_3_13_1 /* MAX VERSION is the maximum
d1681e
                                                   count in VME table, should
d1681e
                                                   keep changing with
d1681e
                                                   introduction of newer
d1681e
@@ -103,6 +103,8 @@
d1681e
 
d1681e
 #define GD_OP_VERSION_3_13_0   31300 /* Op-version for GlusterFS 3.13.0 */
d1681e
 
d1681e
+#define GD_OP_VERSION_3_13_1   31301 /* Op-version for GlusterFS 3.13.1 */
d1681e
+
d1681e
 #include "xlator.h"
d1681e
 
d1681e
 /* THIS */
d1681e
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
d1681e
index a57eb9e..c255be0 100644
d1681e
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
d1681e
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
d1681e
@@ -1762,6 +1762,18 @@ struct volopt_map_entry glusterd_volopt_map[] = {
d1681e
           .op_version = GD_OP_VERSION_RHS_3_0,
d1681e
           .flags      = OPT_FLAG_CLIENT_OPT
d1681e
         },
d1681e
+        { .key        = "performance.write-behind-trickling-writes",
d1681e
+          .voltype    = "performance/write-behind",
d1681e
+          .option     = "trickling-writes",
d1681e
+          .op_version = GD_OP_VERSION_3_13_1,
d1681e
+          .flags      = OPT_FLAG_CLIENT_OPT
d1681e
+        },
d1681e
+        { .key        = "performance.nfs.write-behind-trickling-writes",
d1681e
+          .voltype    = "performance/write-behind",
d1681e
+          .option     = "trickling-writes",
d1681e
+          .op_version = GD_OP_VERSION_3_13_1,
d1681e
+          .flags      = OPT_FLAG_CLIENT_OPT
d1681e
+        },
d1681e
         { .key        = "performance.lazy-open",
d1681e
           .voltype    = "performance/open-behind",
d1681e
           .option     = "lazy-open",
d1681e
-- 
d1681e
1.8.3.1
d1681e