|
 |
21ab4e |
From dbde5b8cd97feb1ff16e799eb6553423807784cd Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Kotresh HR <khiremat@redhat.com>
|
|
|
21ab4e |
Date: Mon, 31 Jul 2017 00:34:45 -0400
|
|
|
21ab4e |
Subject: [PATCH 579/587] geo-rep: Fix worker crash during rmdir
|
|
|
21ab4e |
|
|
|
21ab4e |
As part of improving debugging ability and logging
|
|
|
21ab4e |
improvements, structured logging support [1] is
|
|
|
21ab4e |
introduced and is merged in upstream. That is not
|
|
|
21ab4e |
taken in downstream 3.3. But as part of the fix [2]
|
|
|
21ab4e |
the patch using the structured logging support has
|
|
|
21ab4e |
sneaked in downstream 3.3. Fixed the same.
|
|
|
21ab4e |
|
|
|
21ab4e |
[1]: https://review.gluster.org/#/c/17551/
|
|
|
21ab4e |
[2]: https://code.engineering.redhat.com/gerrit/#/c/111301/
|
|
|
21ab4e |
|
|
|
21ab4e |
Label: DOWNSTREAM ONLY
|
|
|
21ab4e |
|
|
|
21ab4e |
Change-Id: Icb5d99a3fc7d3ced53d3310a378a7deab0cd4b78
|
|
|
21ab4e |
BUG: 1476556
|
|
|
21ab4e |
Signed-off-by: Kotresh HR <khiremat@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/113848
|
|
|
21ab4e |
Reviewed-by: Aravinda Vishwanathapura Krishna Murthy <avishwan@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
geo-replication/syncdaemon/master.py | 5 +++--
|
|
|
21ab4e |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/geo-replication/syncdaemon/master.py b/geo-replication/syncdaemon/master.py
|
|
|
21ab4e |
index b486de4..52537ff 100644
|
|
|
21ab4e |
--- a/geo-replication/syncdaemon/master.py
|
|
|
21ab4e |
+++ b/geo-replication/syncdaemon/master.py
|
|
|
21ab4e |
@@ -826,8 +826,9 @@ class GMasterChangelogMixin(GMasterCommon):
|
|
|
21ab4e |
datas.remove(pt)
|
|
|
21ab4e |
|
|
|
21ab4e |
if ty in ['RMDIR'] and not isinstance(st, int):
|
|
|
21ab4e |
- logging.info(lf('Ignoring rmdir. Directory present in '
|
|
|
21ab4e |
- 'master', gfid=gfid, pgfid_bname=en))
|
|
|
21ab4e |
+ logging.info('Ignoring rmdir. Directory present in '
|
|
|
21ab4e |
+ 'master gfid=%s pgfid_bname=%s' %
|
|
|
21ab4e |
+ (gfid, repr(en)))
|
|
|
21ab4e |
continue
|
|
|
21ab4e |
|
|
|
21ab4e |
if not boolify(gconf.ignore_deletes):
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|