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