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