andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

geo-rep: Fix issues related config set

Browse Source 
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 <khiremat@redhat.com>
fixes: bz#1629561
This commit is contained in:
Kotresh HR 2018-09-14 03:42:26 -04:00 committed by Amar Tumballi
parent 484f417da9
commit b977b44dd0
6 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
geo-replication/gsyncd.conf.in
View File

@ -307,10 +307,12 @@ value=
value=
[rsync-opt-ignore-missing-args]
value=
value=true
type=bool
[rsync-opt-existing]
value=
value=true
type=bool
[log-rsync-performance]
value=false

8
geo-replication/syncdaemon/argsupgrade.py
View File

@ -268,7 +268,9 @@ def upgrade():
p = ArgumentParser()
p.add_argument("master")
p.add_argument("slave")
p.add_argument("--config-set", nargs=2)
p.add_argument("--config-set", action='store_true')
p.add_argument("name")
p.add_argument("--value")
p.add_argument("-c")
pargs = p.parse_known_args(sys.argv[1:])[0]
@ -280,8 +282,8 @@ def upgrade():
"config-set",
pargs.master.strip(":"),
slave_url(pargs.slave),
pargs.config_set[0],
pargs.config_set[1]
"--name=%s" % pargs.name,
"--value=%s" % pargs.value
]
elif "--config-check" in sys.argv:
# --config-check georep_session_working_dir

4
geo-replication/syncdaemon/gsyncd.py
View File

@ -165,8 +165,8 @@ def main():
p = sp.add_parser("config-set")
p.add_argument("master", help="Master Volume Name")
p.add_argument("slave", help="Slave")
p.add_argument("name", help="Config Name")
p.add_argument("value", help="Config Value")
p.add_argument("-n", "--name", help="Config Name")
p.add_argument("-v", "--value", help="Config Value")
p.add_argument("-c", "--config-file", help="Config File")
p.add_argument("--debug", action="store_true")

4
tests/00-geo-rep/georep-basic-dr-rsync.t
View File

@ -196,6 +196,10 @@ EXPECT_WITHIN $GEO_REP_TIMEOUT 0 verify_hardlink_rename_data ${slave_mnt}
#rsnapshot usecase
EXPECT_WITHIN $GEO_REP_TIMEOUT 0 verify_rsnapshot_data ${slave_mnt}
#Test rsync-options set BUG:1629561
TEST gluster volume geo-rep $master $slave config rsync-options "--whole-file"
TEST "echo sampledata > $master_mnt/rsync_option_test_file"
#Verify arequal for whole volume
EXPECT_WITHIN $GEO_REP_TIMEOUT 0 arequal_checksum ${master_mnt} ${slave_mnt}

5
xlators/mgmt/glusterd/src/glusterd-geo-rep.c
View File

@ -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,

4
xlators/mgmt/glusterd/src/glusterd-utils.c
View File

@ -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);