14f8ab
From a3538a7d1fb7674acdf0934847f4004d8fbc4709 Mon Sep 17 00:00:00 2001
14f8ab
From: Milind Changire <mchangir@redhat.com>
14f8ab
Date: Tue, 11 Dec 2018 17:57:50 +0530
14f8ab
Subject: [PATCH 26/52] glusterd: Introduce daemon-log-level cluster wide
14f8ab
 option
14f8ab
14f8ab
This option, applicable to the node level daemons can be very helpful in
14f8ab
controlling the log level of these services. Please note any daemon
14f8ab
which is started prior to setting the specific value of this option (if
14f8ab
not INFO) will need to go through a restart to have this change into
14f8ab
effect.
14f8ab
14f8ab
> upstream patch : https://review.gluster.org/#/c/20442/
14f8ab
14f8ab
Please note there's a difference in deownstream delta. The op-version
14f8ab
against this option is already tageed as 3_11_2 in RHGS 3.3.1 and hence
14f8ab
the same is retained. Marking this DOWNSTREAM_ONLY label because of
14f8ab
14f8ab
Label: DOWNSTREAM ONLY
14f8ab
14f8ab
IMPORTANT:
14f8ab
This patch only sets .op_version in glusterd-volume-set.c to
14f8ab
GD_OP_VERSION_3_11_2 as per Atin's recommendation on
14f8ab
Tue, Dec 11, 2018 5:46pm IST
14f8ab
14f8ab
>Change-Id: I7f6d2620bab2b094c737f5cc816bc093e9c9c4c9
14f8ab
>fixes: bz#1597473
14f8ab
>Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
14f8ab
14f8ab
Change-Id: I7f6d2620bab2b094c737f5cc816bc093e9c9c4c9
14f8ab
Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
14f8ab
Reviewed-on: https://code.engineering.redhat.com/gerrit/143137
14f8ab
Tested-by: RHGS Build Bot <nigelb@redhat.com>
14f8ab
Reviewed-by: Sanju Rakonde <srakonde@redhat.com>
14f8ab
---
14f8ab
 libglusterfs/src/glusterfs/globals.h            | 2 ++
14f8ab
 xlators/mgmt/glusterd/src/glusterd-volume-set.c | 2 +-
14f8ab
 2 files changed, 3 insertions(+), 1 deletion(-)
14f8ab
14f8ab
diff --git a/libglusterfs/src/glusterfs/globals.h b/libglusterfs/src/glusterfs/globals.h
14f8ab
index b9da872..a278f18 100644
14f8ab
--- a/libglusterfs/src/glusterfs/globals.h
14f8ab
+++ b/libglusterfs/src/glusterfs/globals.h
14f8ab
@@ -104,6 +104,8 @@
14f8ab
 
14f8ab
 #define GD_OP_VERSION_3_11_1 31101 /* Op-version for GlusterFS 3.11.1 */
14f8ab
 
14f8ab
+#define GD_OP_VERSION_3_11_2 31102 /* Op-version for GlusterFS 3.11.2 */
14f8ab
+
14f8ab
 #define GD_OP_VERSION_3_12_0 31200 /* Op-version for GlusterFS 3.12.0 */
14f8ab
 
14f8ab
 #define GD_OP_VERSION_3_12_2 31202 /* Op-version for GlusterFS 3.12.2 */
14f8ab
diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
14f8ab
index fed2864..84f2705 100644
14f8ab
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
14f8ab
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
14f8ab
@@ -2859,7 +2859,7 @@ struct volopt_map_entry glusterd_volopt_map[] = {
14f8ab
      .voltype = "mgmt/glusterd",
14f8ab
      .type = GLOBAL_NO_DOC,
14f8ab
      .value = "INFO",
14f8ab
-     .op_version = GD_OP_VERSION_5_0},
14f8ab
+     .op_version = GD_OP_VERSION_3_11_2},
14f8ab
     {.key = "debug.delay-gen",
14f8ab
      .voltype = "debug/delay-gen",
14f8ab
      .option = "!debug",
14f8ab
-- 
14f8ab
1.8.3.1
14f8ab