diff options
authorKotresh HR <>2019-08-16 16:07:03 +0530
committerAravinda VK <>2019-08-22 10:02:42 +0000
commit5e52f1900b5c61ea429f25fdcf9dfb6c56f550af (patch)
parentd14d0749340d9cb1ef6fc4b35f2fb3015ed0339d (diff)
geo-rep: Fix the name of changelog archive file
Background: The processed changelogs are archived each month in a single tar file. The default format is "archive_YYYYMM.tar" which is specified as "%%Y%%m" in configuration file. Problem: The created changelog archive file didn't have corresponding year and month. It created as "archive_%Y%m.tar" on python2 only systems. Cause and Fix: Geo-rep expects "%Y%m" after the ConfigParser reads it from config file. Since it was "%%Y%%m" in config file, geo-rep used to get correct value "%Y%m" in python3 and "%%Y%%m" in python2 which is incorrect. The fix can be to use "%Y%m" in config file but that fails in python3. So the fix is to use "RawConfigParser" in geo-rep and use "%Y%m". This works both in python2 and python3. Change-Id: Ie5b7d2bc04d0d53cd1769e064c2d67aaf95d557c fixes: bz#1741890 Signed-off-by: Kotresh HR <>
2 files changed, 8 insertions, 8 deletions
diff --git a/geo-replication/ b/geo-replication/
index c2e4f0dbdc1..5ebd57a7120 100644
--- a/geo-replication/
+++ b/geo-replication/
@@ -109,7 +109,7 @@ type=int
help=Minimum time interval in seconds for passive worker to become Active
help=Processed changelogs will be archived in working directory. Pattern for archive file
diff --git a/geo-replication/syncdaemon/ b/geo-replication/syncdaemon/
index 61f91f7b727..8848071997a 100644
--- a/geo-replication/syncdaemon/
+++ b/geo-replication/syncdaemon/
@@ -10,9 +10,9 @@
- from ConfigParser import ConfigParser, NoSectionError
+ from ConfigParser import RawConfigParser, NoSectionError
except ImportError:
- from configparser import ConfigParser, NoSectionError
+ from configparser import RawConfigParser, NoSectionError
import os
import shutil
from string import Template
@@ -94,7 +94,7 @@ class Gconf(object):
if name != "all" and not self._is_configurable(name):
raise GconfNotConfigurable()
- cnf = ConfigParser()
+ cnf = RawConfigParser()
with open(self.custom_conf_file) as f:
@@ -138,7 +138,7 @@ class Gconf(object):
if curr_val == value:
return True
- cnf = ConfigParser()
+ cnf = RawConfigParser()
with open(self.custom_conf_file) as f:
@@ -178,7 +178,7 @@ class Gconf(object):
self.session_conf_items = []
self.default_values = {}
- conf = ConfigParser()
+ conf = RawConfigParser()
# Default Template config file
with open(self.default_conf_file) as f:
@@ -345,7 +345,7 @@ class Gconf(object):
return False
def is_config_file_old(config_file, mastervol, slavevol):
- cnf = ConfigParser()
+ cnf = RawConfigParser()
session_section = "peers %s %s" % (mastervol, slavevol)
@@ -360,7 +360,7 @@ def config_upgrade(config_file, ret):
shutil.copyfile(config_file, config_file_backup)
#write a new config file
- config = ConfigParser()
+ config = RawConfigParser()
for key, value in ret.items():