summaryrefslogtreecommitdiffstats
path: root/cli
diff options
context:
space:
mode:
authorSamikshan Bairagya <samikshan@gmail.com>2016-09-23 16:35:15 +0530
committerAtin Mukherjee <amukherj@redhat.com>2016-12-30 20:47:27 -0800
commit08056421b886b1ebf1e0eed93d9f6f9b6d017489 (patch)
treea83374aa443f956d17d4b0de897345c7be47c1a4 /cli
parent14ae0c6b14c9a32f15cdb3c94edbf08bb2e708b6 (diff)
glusterd, cli: Get global options through volume get functionality
Currently it is not possible to retrieve values of global options by using the 'gluster volume get' functionality if there are no volumes present. In order to get the global options one has to use 'gluster volume get' with a specific volume name. This usage makes the illusion as though the option is set only on one volume, which is incorrect. When setting the global options, 'gluster volume set' provides a way to set them using the volume name as 'all'. Similarly, retrieving the global options should be made possible by using the volume name 'all' with the 'gluster volume get' functionality. This patch adds that functionality to 'volume get' Usage: # gluster volume get all <OPTION/all> Change-Id: Ic2fdb9eda69d4806d432dae26d117d9660fe6d4e BUG: 1378842 Signed-off-by: Samikshan Bairagya <samikshan@gmail.com> Reviewed-on: http://review.gluster.org/15563 Smoke: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'cli')
-rw-r--r--cli/src/cli-rpc-ops.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/cli/src/cli-rpc-ops.c b/cli/src/cli-rpc-ops.c
index 53f5ef3..97cf741 100644
--- a/cli/src/cli-rpc-ops.c
+++ b/cli/src/cli-rpc-ops.c
@@ -11398,12 +11398,18 @@ gf_cli_get_vol_opt_cbk (struct rpc_req *req, struct iovec *iov, int count,
goto out;
}
+ ret = dict_get_str (dict, "warning", &value);
+ if (!ret) {
+ cli_out ("%s", value);
+ }
+
ret = dict_get_int32 (dict, "count", &count);
if (ret) {
gf_log ("cli", GF_LOG_ERROR, "Failed to retrieve count "
"from the dictionary");
goto out;
}
+
if (count <= 0) {
gf_log ("cli", GF_LOG_ERROR, "Value of count :%d is "
"invalid", count);