From 05f9340a533982ec5e421309673de6530fc28ed5 Mon Sep 17 00:00:00 2001 From: Shwetha K Acharya Date: Tue, 2 Jul 2019 15:00:25 +0530 Subject: geo-rep: Test case for upgrading config file Added test case for the patch https://review.gluster.org/#/c/glusterfs/+/22894/4 Also updated if else structure in gsyncdconfig.py to avoid repeated occurance of values in new configfile. Backport of: > Patch: https://review.gluster.org/22982 > BUG: 1707731 > Change-Id: If97e1d37ac52dbd17d47be6cb659fc5a3ccab6d7 > Signed-off-by: Shwetha K Acharya fixes: bz#1764003 Change-Id: If97e1d37ac52dbd17d47be6cb659fc5a3ccab6d7 Signed-off-by: Kotresh HR --- geo-replication/syncdaemon/gsyncdconfig.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'geo-replication') diff --git a/geo-replication/syncdaemon/gsyncdconfig.py b/geo-replication/syncdaemon/gsyncdconfig.py index 68d1b489e23..0476d5ec05c 100644 --- a/geo-replication/syncdaemon/gsyncdconfig.py +++ b/geo-replication/syncdaemon/gsyncdconfig.py @@ -356,15 +356,14 @@ def config_upgrade(config_file, ret): new_value = "tarssh" else: new_value = "rsync" - config.set('vars', new_key, new_value) - - if key == "timeout": + config.set('vars', new_key, new_value) + elif key == "timeout": new_key = "slave-timeout" config.set('vars', new_key, value) - #for changes like: ignore_deletes to ignore-deletes - new_key = key.replace("_", "-") - config.set('vars', new_key, value) + else: + new_key = key.replace("_", "-") + config.set('vars', new_key, value) with open(config_file, 'w') as configfile: config.write(configfile) -- cgit