|
 |
d1681e |
From 8216bddb4f563823a2e7cf046646b3b92239924d Mon Sep 17 00:00:00 2001
|
|
|
d1681e |
From: Aravinda VK <avishwan@redhat.com>
|
|
|
d1681e |
Date: Thu, 28 Dec 2017 15:17:34 +0530
|
|
|
d1681e |
Subject: [PATCH 117/128] geo-rep: Log message improvements
|
|
|
d1681e |
|
|
|
d1681e |
>upstream mainline patch: https://review.gluster.org/19103
|
|
|
d1681e |
|
|
|
d1681e |
BUG: 1468972
|
|
|
d1681e |
Change-Id: If4775ed9886990c0e1bcf4e44c7dfef95cc4f0c3
|
|
|
d1681e |
Signed-off-by: Aravinda VK <avishwan@redhat.com>
|
|
|
d1681e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/126634
|
|
|
d1681e |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
d1681e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
d1681e |
---
|
|
|
d1681e |
geo-replication/syncdaemon/gsyncd.py | 2 +-
|
|
|
d1681e |
geo-replication/syncdaemon/master.py | 8 ++++----
|
|
|
d1681e |
geo-replication/syncdaemon/repce.py | 2 +-
|
|
|
d1681e |
geo-replication/syncdaemon/resource.py | 4 ++--
|
|
|
d1681e |
geo-replication/syncdaemon/syncdutils.py | 2 +-
|
|
|
d1681e |
5 files changed, 9 insertions(+), 9 deletions(-)
|
|
|
d1681e |
|
|
|
d1681e |
diff --git a/geo-replication/syncdaemon/gsyncd.py b/geo-replication/syncdaemon/gsyncd.py
|
|
|
d1681e |
index 932e37d..d77b90f 100644
|
|
|
d1681e |
--- a/geo-replication/syncdaemon/gsyncd.py
|
|
|
d1681e |
+++ b/geo-replication/syncdaemon/gsyncd.py
|
|
|
d1681e |
@@ -796,7 +796,7 @@ def main_i():
|
|
|
d1681e |
remote.connect_remote(go_daemon='done')
|
|
|
d1681e |
local.connect()
|
|
|
d1681e |
if ffd:
|
|
|
d1681e |
- logging.info("Closing feedback fd, waking up the monitor")
|
|
|
d1681e |
+ logging.info("Worker spawn successful. Acknowledging back to monitor")
|
|
|
d1681e |
os.close(ffd)
|
|
|
d1681e |
local.service_loop(*[r for r in [remote] if r])
|
|
|
d1681e |
|
|
|
d1681e |
diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py
|
|
|
d1681e |
index 4c1a529..e484692 100644
|
|
|
d1681e |
--- a/geo-replication/syncdaemon/master.py
|
|
|
d1681e |
+++ b/geo-replication/syncdaemon/master.py
|
|
|
d1681e |
@@ -1639,8 +1639,8 @@ class GMasterXsyncMixin(GMasterChangelogMixin):
|
|
|
d1681e |
if isinstance(xtr_root, int):
|
|
|
d1681e |
if xtr_root != ENOENT:
|
|
|
d1681e |
logging.warn(lf("slave cluster not returning the "
|
|
|
d1681e |
- "correct xtime for root",
|
|
|
d1681e |
- xtime=xtr_root))
|
|
|
d1681e |
+ "xtime for root",
|
|
|
d1681e |
+ error=xtr_root))
|
|
|
d1681e |
xtr_root = self.minus_infinity
|
|
|
d1681e |
xtl = self.xtime(path)
|
|
|
d1681e |
if isinstance(xtl, int):
|
|
|
d1681e |
@@ -1649,9 +1649,9 @@ class GMasterXsyncMixin(GMasterChangelogMixin):
|
|
|
d1681e |
if isinstance(xtr, int):
|
|
|
d1681e |
if xtr != ENOENT:
|
|
|
d1681e |
logging.warn(lf("slave cluster not returning the "
|
|
|
d1681e |
- "correct xtime",
|
|
|
d1681e |
+ "xtime for dir",
|
|
|
d1681e |
path=path,
|
|
|
d1681e |
- xtime=xtr))
|
|
|
d1681e |
+ error=xtr))
|
|
|
d1681e |
xtr = self.minus_infinity
|
|
|
d1681e |
xtr = max(xtr, xtr_root)
|
|
|
d1681e |
zero_zero = (0, 0)
|
|
|
d1681e |
diff --git a/geo-replication/syncdaemon/repce.py b/geo-replication/syncdaemon/repce.py
|
|
|
d1681e |
index 0ac1449..8db7d9e 100644
|
|
|
d1681e |
--- a/geo-replication/syncdaemon/repce.py
|
|
|
d1681e |
+++ b/geo-replication/syncdaemon/repce.py
|
|
|
d1681e |
@@ -203,7 +203,7 @@ class RepceClient(object):
|
|
|
d1681e |
meth, *args, **{'cbk': lambda rj, res: rj.wakeup(res)})
|
|
|
d1681e |
exc, res = rjob.wait()
|
|
|
d1681e |
if exc:
|
|
|
d1681e |
- logging.error(lf('call failed on peer',
|
|
|
d1681e |
+ logging.error(lf('call failed',
|
|
|
d1681e |
call=repr(rjob),
|
|
|
d1681e |
method=meth,
|
|
|
d1681e |
error=str(type(res).__name__)))
|
|
|
d1681e |
diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
|
|
|
d1681e |
index 0ca023c..22aaf85 100644
|
|
|
d1681e |
--- a/geo-replication/syncdaemon/resource.py
|
|
|
d1681e |
+++ b/geo-replication/syncdaemon/resource.py
|
|
|
d1681e |
@@ -834,8 +834,8 @@ class Server(object):
|
|
|
d1681e |
except OSError as e:
|
|
|
d1681e |
if e.errno == ENOTEMPTY:
|
|
|
d1681e |
logging.error(
|
|
|
d1681e |
- lf("Unable to delete directory"
|
|
|
d1681e |
- ", Both Old and New"
|
|
|
d1681e |
+ lf("Directory Rename failed. "
|
|
|
d1681e |
+ "Both Old and New"
|
|
|
d1681e |
" directories exists",
|
|
|
d1681e |
old=entry,
|
|
|
d1681e |
new=en))
|
|
|
d1681e |
diff --git a/geo-replication/syncdaemon/syncdutils.py b/geo-replication/syncdaemon/syncdutils.py
|
|
|
d1681e |
index 2187ecd..269f301 100644
|
|
|
d1681e |
--- a/geo-replication/syncdaemon/syncdutils.py
|
|
|
d1681e |
+++ b/geo-replication/syncdaemon/syncdutils.py
|
|
|
d1681e |
@@ -321,7 +321,7 @@ def log_raise_exception(excont):
|
|
|
d1681e |
gconf.transport.terminate_geterr()
|
|
|
d1681e |
elif isinstance(exc, OSError) and exc.errno in (ENOTCONN,
|
|
|
d1681e |
ECONNABORTED):
|
|
|
d1681e |
- logging.error(lf('glusterfs session went down',
|
|
|
d1681e |
+ logging.error(lf('Gluster Mount process exited',
|
|
|
d1681e |
error=errorcode[exc.errno]))
|
|
|
d1681e |
else:
|
|
|
d1681e |
logtag = "FAIL"
|
|
|
d1681e |
--
|
|
|
d1681e |
1.8.3.1
|
|
|
d1681e |
|