From 9a155ab065d1a43f1b7806ab0eec43126c78da92 Mon Sep 17 00:00:00 2001 From: Aravinda VK Date: Tue, 18 Oct 2016 13:34:57 +0530 Subject: geo-rep: Upgrade conf file only if it is session config Ignore config upgrade if it is template config file present in /var/lib/glusterd/geo-replication/gsyncd_template.conf > Reviewed-on: http://review.gluster.org/15669 > Smoke: Gluster Build System > CentOS-regression: Gluster Build System > Reviewed-by: Kotresh HR > NetBSD-regression: NetBSD Build System BUG: 1399088 Change-Id: I2cbba3103b6801c16ff57f778a90b9a0bb2467cf Signed-off-by: Aravinda VK (cherry picked from commit 1506c7a98d8d3b31e68d0f214ab331f28ffa9fb5) Reviewed-on: http://review.gluster.org/15938 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Kotresh HR --- geo-replication/syncdaemon/gsyncd.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'geo-replication') diff --git a/geo-replication/syncdaemon/gsyncd.py b/geo-replication/syncdaemon/gsyncd.py index b459abcccee..6591716056c 100644 --- a/geo-replication/syncdaemon/gsyncd.py +++ b/geo-replication/syncdaemon/gsyncd.py @@ -539,7 +539,10 @@ def main_i(): if not 'config_file' in rconf: rconf['config_file'] = TMPL_CONFIG_FILE - upgrade_config_file(rconf['config_file'], confdata) + # Upgrade Config File only if it is session conf file + if rconf['config_file'] != TMPL_CONFIG_FILE: + upgrade_config_file(rconf['config_file'], confdata) + gcnf = GConffile( rconf['config_file'], canon_peers, confdata, defaults.__dict__, opts.__dict__, namedict) -- cgit