summaryrefslogtreecommitdiffstats
path: root/geo-replication
diff options
context:
space:
mode:
authorAravinda VK <avishwan@redhat.com>2016-10-18 13:34:57 +0530
committerAravinda VK <avishwan@redhat.com>2016-10-24 08:26:24 -0700
commit1506c7a98d8d3b31e68d0f214ab331f28ffa9fb5 (patch)
tree6815279c4e496258d91b87cac1084bcc8fcb1c27 /geo-replication
parent41dc5ee07ffba6d17459757abf13fae9f174e6b6 (diff)
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 BUG: 1386123 Change-Id: I2cbba3103b6801c16ff57f778a90b9a0bb2467cf Signed-off-by: Aravinda VK <avishwan@redhat.com> Reviewed-on: http://review.gluster.org/15669 Smoke: Gluster Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Kotresh HR <khiremat@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Diffstat (limited to 'geo-replication')
-rw-r--r--geo-replication/syncdaemon/gsyncd.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/geo-replication/syncdaemon/gsyncd.py b/geo-replication/syncdaemon/gsyncd.py
index 68019be5549..97b218e84d0 100644
--- a/geo-replication/syncdaemon/gsyncd.py
+++ b/geo-replication/syncdaemon/gsyncd.py
@@ -541,7 +541,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)