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