diff options
author | Kotresh HR <khiremat@redhat.com> | 2018-09-14 03:42:26 -0400 |
---|---|---|
committer | Kotresh HR <khiremat@redhat.com> | 2018-09-19 04:10:40 +0000 |
commit | 112b50070861101be2d6cc8d8e96af75359a8ca3 (patch) | |
tree | 450d36c88a0e57d159188f7b720450fcbc65206d /xlators/mgmt/glusterd | |
parent | f4594a3c88cb0a76e260010d57632dc1c718fd5f (diff) |
geo-rep: Fix issues related config set
1. '--ignore-mising-args' option for rsync is not
being used even though the rsync version is
greater than 3.1.0. Fixed the same.
2. '--existing' option for rsync is also not being
used. Fixed the same.
3. geo-rep config fails to set rsync-options as the
value contains '--'. Interestingly, python argsparse
treats the value with '--' (e.g., --ignore-missing-args)
as option. But when passed with something like
--value=--ignore-missing-args, it succeeds. Fixed the
same.
Backport of:
> Patch: https://review.gluster.org/21191
> Change-Id: Iaeb838acaff1c2920fee9c7f920c99edce13a0a1
> Signed-off-by: Kotresh HR <khiremat@redhat.com>
> BUG: 1629561
(cherry picked from commit b977b44dd0adfcd7a3b432844260de4b8d1c4adf)
Change-Id: Iaeb838acaff1c2920fee9c7f920c99edce13a0a1
Signed-off-by: Kotresh HR <khiremat@redhat.com>
fixes: bz#1630673
Diffstat (limited to 'xlators/mgmt/glusterd')
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-geo-rep.c | 5 | ||||
-rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-utils.c | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c index 075fdf74369..39617be827b 100644 --- a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c +++ b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c @@ -4314,8 +4314,9 @@ glusterd_gsync_configure(glusterd_volinfo_t *volinfo, char *slave, runner_add_arg(&runner, slave); runner_argprintf(&runner, "--config-%s", subop); runner_add_arg(&runner, op_name); - if (op_value) - runner_add_arg(&runner, op_value); + if (op_value) { + runner_argprintf(&runner, "--value=%s", op_value); + } if (strcmp(op_name, "checkpoint") != 0 && strtail(subop, "set")) { ret = glusterd_gsync_op_already_set(master, slave, conf_path, op_name, diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c index d1efce4aef1..1214b6cbb19 100644 --- a/xlators/mgmt/glusterd/src/glusterd-utils.c +++ b/xlators/mgmt/glusterd/src/glusterd-utils.c @@ -8151,8 +8151,8 @@ glusterd_start_gsync(glusterd_volinfo_t *master_vol, char *slave, runner_add_args(&runner, GSYNCD_PREFIX "/gsyncd", path_list, "-c", NULL); runner_argprintf(&runner, "%s", conf_path); runner_argprintf(&runner, ":%s", master_vol->volname); - runner_add_args(&runner, slave, "--config-set", "session-owner", uuid_str, - NULL); + runner_add_args(&runner, slave, "--config-set", "session-owner", NULL); + runner_argprintf(&runner, "--value=%s", uuid_str); synclock_unlock(&priv->big_lock); ret = runner_run(&runner); synclock_lock(&priv->big_lock); |