From b977b44dd0adfcd7a3b432844260de4b8d1c4adf Mon Sep 17 00:00:00 2001 From: Kotresh HR Date: Fri, 14 Sep 2018 03:42:26 -0400 Subject: 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. Change-Id: Iaeb838acaff1c2920fee9c7f920c99edce13a0a1 Signed-off-by: Kotresh HR fixes: bz#1629561 --- xlators/mgmt/glusterd/src/glusterd-geo-rep.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-geo-rep.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-geo-rep.c b/xlators/mgmt/glusterd/src/glusterd-geo-rep.c index b550d373ed2..948655bf815 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, -- cgit