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