diff options
| author | Samikshan Bairagya <samikshan@gmail.com> | 2016-09-23 16:35:15 +0530 |
|---|---|---|
| committer | Atin Mukherjee <amukherj@redhat.com> | 2016-12-30 20:47:27 -0800 |
| commit | 08056421b886b1ebf1e0eed93d9f6f9b6d017489 (patch) | |
| tree | a83374aa443f956d17d4b0de897345c7be47c1a4 /xlators/mgmt/glusterd/src/glusterd-utils.h | |
| parent | 14ae0c6b14c9a32f15cdb3c94edbf08bb2e708b6 (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 'xlators/mgmt/glusterd/src/glusterd-utils.h')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.h | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.h b/xlators/mgmt/glusterd/src/glusterd-utils.h index 419ab48323a..914d7977b51 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.h +++ b/xlators/mgmt/glusterd/src/glusterd-utils.h @@ -32,6 +32,39 @@ volinfo->volname, brickid);\ } while (0) +#define ALL_VOLUME_OPTION_CHECK(volname, get_opt, key, ret, op_errstr, label) \ + do { \ + gf_boolean_t _all = !strcmp ("all", volname); \ + gf_boolean_t _is_valid_opt = _gf_false; \ + int32_t i = 0; \ + \ + if (strcmp (key, "all") == 0 && !get_opt) { \ + ret = -1; \ + *op_errstr = gf_strdup ("Not a valid option to set"); \ + } \ + \ + for (i = 0; valid_all_vol_opts[i].option; i++) { \ + if (!strcmp (key, "all") || \ + !strcmp (key, valid_all_vol_opts[i].option)) { \ + _is_valid_opt = _gf_true; \ + break; \ + } \ + } \ + \ + if (_all && !_is_valid_opt) { \ + ret = -1; \ + *op_errstr = gf_strdup ("Not a valid option for all " \ + "volumes"); \ + goto label; \ + } else if (!_all && _is_valid_opt) { \ + ret = -1; \ + *op_errstr = gf_strdup ("Not a valid option for " \ + "single volume"); \ + goto label; \ + } \ + } while (0) \ + + struct glusterd_lock_ { uuid_t owner; time_t timestamp; @@ -624,6 +657,9 @@ int glusterd_get_volopt_content (dict_t *dict, gf_boolean_t xml_out); int +glusterd_get_global_options_for_all_vols (dict_t *dict, char **op_errstr); + +int glusterd_get_default_val_for_volopt (dict_t *dict, gf_boolean_t all_opts, char *key, char *orig_key, dict_t *vol_dict, char **err_str); |