diff options
| author | Aravinda VK <avishwan@redhat.com> | 2017-11-24 12:11:16 +0530 |
|---|---|---|
| committer | Kotresh HR <khiremat@redhat.com> | 2017-11-27 06:22:47 +0000 |
| commit | 493545657bd122ba63d77553873c7f433fb74d04 (patch) | |
| tree | c6dcee900e2eabce5755353b27bfd92ce13b949e /geo-replication/syncdaemon/gsyncd.py | |
| parent | 683b15a6a2e6c0efbb45db3fd97b9cf08c4f7194 (diff) | |
geo-rep: Fix slave side custom config issue
Slave gsyncd will not use session config files, Slave configs are
stored in Master config file itself and sent as argument to slave
gsyncd.
With this patch, gconf default values are overwritten if argument
name starts with "slave-"
Change-Id: Iebc51f52232c0cd30b29199f03015f97b70ce537
Signed-off-by: Aravinda VK <avishwan@redhat.com>
BUG: 1517068
Diffstat (limited to 'geo-replication/syncdaemon/gsyncd.py')
| -rw-r--r-- | geo-replication/syncdaemon/gsyncd.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/geo-replication/syncdaemon/gsyncd.py b/geo-replication/syncdaemon/gsyncd.py index f58b532bcda..ae7b701a10c 100644 --- a/geo-replication/syncdaemon/gsyncd.py +++ b/geo-replication/syncdaemon/gsyncd.py @@ -235,11 +235,17 @@ def main(): rconf.config_file = config_file + # Override gconf values from argument values only if it is slave gsyncd + override_from_args = False + if args.subcmd == "slave": + override_from_args = True + # Load Config file gconf.load(GLUSTERFS_CONFDIR + "/gsyncd.conf", config_file, vars(args), - extra_tmpl_args) + extra_tmpl_args, + override_from_args) # Default label to print in log file label = args.subcmd |