From f782881f825efcd4ab3b74209c1c7aca3796023b Mon Sep 17 00:00:00 2001 From: Shwetha K Acharya Date: Wed, 29 May 2019 16:49:01 +0530 Subject: geo-rep: Upgrading config file to new version - configuration handling is enhanced with patch https://review.gluster.org/#/c/glusterfs/+/18257/ - hence, the old configurations are not applied when Geo-rep session is created in the old version and upgraded. This patch solves the issue. It, - checks if the config file is old. - parses required values from old config file and stores in new config file, which ensures that configerations are applied on upgrade. - stores old config file as backup. - handles changes in options introduced in https://review.gluster.org/#/c/glusterfs/+/18257/ fixes: bz#1707731 Change-Id: Iad8da6c1e1ae8ecf7c84dfdf8ea3ac6966d8a2a0 Signed-off-by: Shwetha K Acharya --- geo-replication/syncdaemon/gsyncdconfig.py | 41 ++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) (limited to 'geo-replication/syncdaemon/gsyncdconfig.py') diff --git a/geo-replication/syncdaemon/gsyncdconfig.py b/geo-replication/syncdaemon/gsyncdconfig.py index 26fb6a57318..68d1b489e23 100644 --- a/geo-replication/syncdaemon/gsyncdconfig.py +++ b/geo-replication/syncdaemon/gsyncdconfig.py @@ -14,6 +14,7 @@ try: except ImportError: from configparser import ConfigParser, NoSectionError import os +import shutil from string import Template from datetime import datetime @@ -328,6 +329,46 @@ class Gconf(object): return False +def is_config_file_old(config_file, mastervol, slavevol): + cnf = ConfigParser() + cnf.read(config_file) + session_section = "peers %s %s" % (mastervol, slavevol) + try: + return dict(cnf.items(session_section)) + except NoSectionError: + return None + +def config_upgrade(config_file, ret): + config_file_backup = os.path.join(os.path.dirname(config_file), "gsyncd.conf.bkp") + + #copy old config file in a backup file + shutil.copyfile(config_file, config_file_backup) + + #write a new config file + config = ConfigParser() + config.add_section('vars') + + for key, value in ret.items(): + #handle option name changes + if key == "use_tarssh": + new_key = "sync-method" + if value == "true": + new_value = "tarssh" + else: + new_value = "rsync" + config.set('vars', new_key, new_value) + + if 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) + + with open(config_file, 'w') as configfile: + config.write(configfile) + def validate_int(value): try: -- cgit