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