diff options
| author | Venky Shankar <vshankar@redhat.com> | 2014-03-19 19:32:15 +0530 |
|---|---|---|
| committer | Venky Shankar <vshankar@redhat.com> | 2014-06-10 09:55:55 -0700 |
| commit | ec5d64eafcd77b1746b83173de16f7ec742af7a6 (patch) | |
| tree | 0da4e4dded44f3f5031748f2ed96b249bfa0d04d /geo-replication/syncdaemon/master.py | |
| parent | 99781d55f16373e793138c7b011eea09a62075b9 (diff) | |
gsyncd / geo-rep: FSH recommended log locations
Upgrading "working_dir" on the fly is a bit unclean yet
(though it works) as currently config upgrade does not
support "old" values to be expanded by using configuration
variables.
Change-Id: I44ed65c281f2e0ce3b6b467addc5c1c88ac674e7
BUG: 1077516
Signed-off-by: Venky Shankar <vshankar@redhat.com>
Signed-off-by: Kotresh H R <khiremat@redhat.com>
Signed-off-by: Aravinda VK <avishwan@redhat.com>
Signed-off-by: Ajeet Jha <ajha@redhat.com>
Reviewed-on: http://review.gluster.org/7375
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'geo-replication/syncdaemon/master.py')
| -rw-r--r-- | geo-replication/syncdaemon/master.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py index 875f2791e0d..94c58bb3c9d 100644 --- a/geo-replication/syncdaemon/master.py +++ b/geo-replication/syncdaemon/master.py @@ -725,6 +725,9 @@ class GMasterChangelogMixin(GMasterCommon): # maximum retries per changelog before giving up MAX_RETRIES = 10 + CHANGELOG_LOG_LEVEL = 9 + CHANGELOG_CONN_RETRIES = 5 + def fallback_xsync(self): logging.info('falling back to xsync mode') gconf.configinterface.set('change-detector', 'xsync') @@ -732,10 +735,8 @@ class GMasterChangelogMixin(GMasterCommon): def setup_working_dir(self): workdir = os.path.join(gconf.working_dir, md5hex(gconf.local_path)) - logfile = os.path.join(workdir, 'changes.log') - logging.debug('changelog working dir %s (log: %s)' % - (workdir, logfile)) - return (workdir, logfile) + logging.debug('changelog working dir %s' % workdir) + return workdir def process_change(self, change, done, retry): pfx = gauxpfx() @@ -1216,7 +1217,7 @@ class GMasterXsyncMixin(GMasterChangelogMixin): self.comlist = [] self.stimes = [] self.sleep_interval = 60 - self.tempdir = self.setup_working_dir()[0] + self.tempdir = self.setup_working_dir() self.tempdir = os.path.join(self.tempdir, 'xsync') logging.info('xsync temp directory: %s' % self.tempdir) try: |