From 95b75f1b4e2ccdabd4d5c4e9bbff872701aa1df7 Mon Sep 17 00:00:00 2001
From: Samikshan Bairagya <samikshan@gmail.com>
Date: Mon, 17 Jul 2017 17:38:48 +0530
Subject: [PATCH 568/569] glusterd: Add description field to global options for
 brick-mux

Currently the "cluster.brick-multiplex" and
"cluster.max-bricks-per-process" options do not show anything in
the description field when gluster volume set help is called. This
commit adds the description fields for these 2 options.

> Signed-off-by: Samikshan Bairagya <samikshan@gmail.com>
> Reviewed-on: https://review.gluster.org/17790
> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
> Smoke: Gluster Build System <jenkins@build.gluster.org>
> Reviewed-by: Gaurav Yadav <gyadav@redhat.com>
> CentOS-regression: Gluster Build System <jenkins@build.gluster.org>

Change-Id: I3d162c61fa2774dd994f046e305d457f0fd43192
BUG: 1444790
Signed-off-by: Samikshan Bairagya <sbairagy@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/112820
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
 xlators/mgmt/glusterd/src/glusterd-volume-set.c | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/xlators/mgmt/glusterd/src/glusterd-volume-set.c b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
index 4b3c8df..28989ea 100644
--- a/xlators/mgmt/glusterd/src/glusterd-volume-set.c
+++ b/xlators/mgmt/glusterd/src/glusterd-volume-set.c
@@ -3266,13 +3266,23 @@ struct volopt_map_entry glusterd_volopt_map[] = {
           .voltype     = "mgmt/glusterd",
           .value       = "off",
           .op_version  = GD_OP_VERSION_3_10_0,
-          .validate_fn = validate_boolean
+          .validate_fn = validate_boolean,
+          .type        = GLOBAL_DOC,
+          .description = "This global option can be used to enable/disable "
+                         "brick multiplexing. Brick multiplexing ensures that "
+                         "compatible brick instances can share one single "
+                         "brick process."
         },
         { .key         = GLUSTERD_BRICKMUX_LIMIT_KEY,
           .voltype     = "mgmt/glusterd",
           .value       = "1",
           .op_version  = GD_OP_VERSION_3_11_1,
-          .validate_fn = validate_mux_limit
+          .validate_fn = validate_mux_limit,
+          .type        = GLOBAL_DOC,
+          .description = "This option can be used to limit the number of brick "
+                         "instances per brick process when brick multiplexing "
+                         "is enabled. This option can be set only when brick "
+                         "multiplexing feature enabled."
         },
         { .key         = NULL
         }
-- 
1.8.3.1