geo-rep: Log message improvements

BUG: 1529480
Change-Id: If4775ed9886990c0e1bcf4e44c7dfef95cc4f0c3
Signed-off-by: Aravinda VK <avishwan@redhat.com>

5 files changed, 9 insertions, 9 deletions

diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py
index 89e57b42a37..d0ffffc1f01 100644
--- a/geo-replication/syncdaemon/master.py
+++ b/geo-replication/syncdaemon/master.py
@@ -1660,8 +1660,8 @@ class GMasterXsyncMixin(GMasterChangelogMixin):
             if isinstance(xtr_root, int):
                 if xtr_root != ENOENT:
                     logging.warn(lf("slave cluster not returning the "
-                                    "correct xtime for root",
-                                    xtime=xtr_root))
+                                    "xtime for root",
+                                    error=xtr_root))
                 xtr_root = self.minus_infinity
         xtl = self.xtime(path)
         if isinstance(xtl, int):
@@ -1670,9 +1670,9 @@ class GMasterXsyncMixin(GMasterChangelogMixin):
         if isinstance(xtr, int):
             if xtr != ENOENT:
                 logging.warn(lf("slave cluster not returning the "
-                                "correct xtime",
+                                "xtime for dir",
                                 path=path,
-                                xtime=xtr))
+                                error=xtr))
             xtr = self.minus_infinity
         xtr = max(xtr, xtr_root)
         zero_zero = (0, 0)
diff --git a/geo-replication/syncdaemon/repce.py b/geo-replication/syncdaemon/repce.py
index b4d96b1de47..1fb90c44032 100644
--- a/geo-replication/syncdaemon/repce.py
+++ b/geo-replication/syncdaemon/repce.py
@@ -191,7 +191,7 @@ class RepceClient(object):
             meth, *args, **{'cbk': lambda rj, res: rj.wakeup(res)})
         exc, res = rjob.wait()
         if exc:
-            logging.error(lf('call failed on peer',
+            logging.error(lf('call failed',
                              call=repr(rjob),
                              method=meth,
                              error=str(type(res).__name__)))
diff --git a/geo-replication/syncdaemon/resource.py b/geo-replication/syncdaemon/resource.py
index f5a19629e7a..ab0484d5f5e 100644
--- a/geo-replication/syncdaemon/resource.py
+++ b/geo-replication/syncdaemon/resource.py
@@ -662,8 +662,8 @@ class Server(object):
                                     except OSError as e:
                                         if e.errno == ENOTEMPTY:
                                             logging.error(
-                                                lf("Unable to delete directory"
-                                                   ", Both Old and New"
+                                                lf("Directory Rename failed. "
+                                                   "Both Old and New"
                                                    " directories exists",
                                                    old=entry,
                                                    new=en))
diff --git a/geo-replication/syncdaemon/subcmds.py b/geo-replication/syncdaemon/subcmds.py
index 691c84401c5..258dbb0b658 100644
--- a/geo-replication/syncdaemon/subcmds.py
+++ b/geo-replication/syncdaemon/subcmds.py
@@ -66,7 +66,7 @@ def subcmd_worker(args):
     remote = SSH(slavehost, slavevol)
     remote.connect_remote()
     local.connect()
-    logging.info("Closing feedback fd, waking up the monitor")
+    logging.info("Worker spawn successful. Acknowledging back to monitor")
     os.close(args.feedback_fd)
     local.service_loop(remote)
 
diff --git a/geo-replication/syncdaemon/syncdutils.py b/geo-replication/syncdaemon/syncdutils.py
index 5dd535a5c7f..1f2692254db 100644
--- a/geo-replication/syncdaemon/syncdutils.py
+++ b/geo-replication/syncdaemon/syncdutils.py
@@ -317,7 +317,7 @@ def log_raise_exception(excont):
                 rconf.transport.terminate_geterr()
         elif isinstance(exc, OSError) and exc.errno in (ENOTCONN,
                                                         ECONNABORTED):
-            logging.error(lf('glusterfs session went down',
+            logging.error(lf('Gluster Mount process exited',
                              error=errorcode[exc.errno]))
         else:
             logtag = "FAIL"