diff options
| author | Csaba Henk <csaba@gluster.com> | 2011-09-22 10:12:24 +0200 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2011-09-22 05:24:57 -0700 |
| commit | 21eabe9bae81b3cc732fcf773fb5c1995f19d0d7 (patch) | |
| tree | 3b259c119d6139f50f9d7a141827bb0750e53615 /xlators/mgmt/glusterd/src/glusterd-geo-rep.c | |
| parent | b27b9d36de798bb18eaa95524f3900f9e17ce3e5 (diff) | |
geo-rep: add support to glob patterns with "geo-rep config"
Change-Id: I0d54cea72e4363eab85ade774cc918081d8036e9
BUG: 3610
Reviewed-on: http://review.gluster.com/489
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-geo-rep.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-geo-rep.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c index 19975a689..eae5dd827 100644 --- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c +++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c @@ -484,6 +484,7 @@ gsync_verify_config_options (dict_t *dict, char **op_errstr) char *slave = NULL; char *op_name = NULL; char *op_value = NULL; + char *t = NULL; gf_boolean_t banned = _gf_true; if (dict_get_str (dict, "subop", &subop) != 0) { @@ -517,13 +518,16 @@ gsync_verify_config_options (dict_t *dict, char **op_errstr) if (strcmp (subop, "get") == 0) return 0; - if (strcmp (subop, "set") != 0 && strcmp (subop, "del") != 0) { + t = strtail (subop, "set"); + if (!t) + t = strtail (subop, "del"); + if (!t || (t[0] && strcmp (t, "-glob") != 0)) { gf_log ("", GF_LOG_WARNING, "unknown subop %s", subop); *op_errstr = gf_strdup ("Invalid config request"); return -1; } - if (strcmp (subop, "set") == 0 && + if (strtail (subop, "set") && dict_get_str (dict, "op_value", &op_value) != 0) { gf_log ("", GF_LOG_WARNING, "missing value for set"); *op_errstr = gf_strdup ("missing value"); @@ -1105,7 +1109,7 @@ glusterd_gsync_configure (glusterd_volinfo_t *volinfo, char *slave, if (ret != 0) goto out; - if (strcmp (subop, "set") == 0) { + if (strtail (subop, "set")) { ret = dict_get_str (dict, "op_value", &op_value); if (ret != 0) goto out; |