From f6a3c541941df6fd19ef57185aca5c4bcec2dec3 Mon Sep 17 00:00:00 2001 From: Ravishankar N Date: Fri, 23 Sep 2016 15:16:46 +0530 Subject: afr: Modifications to afr events Modified afr event message to add a 'type' key as detailed in the BZ. Also added events for data and metadata split-brain. Change-Id: I8156674b4b6a501499fc10fd68e05115fdaef3e4 BUG: 1378072 Signed-off-by: Ravishankar N Reviewed-on: http://review.gluster.org/15550 Smoke: Gluster Build System NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System Reviewed-by: Pranith Kumar Karampuri --- xlators/cluster/afr/src/afr-self-heal-entry.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'xlators/cluster/afr/src/afr-self-heal-entry.c') diff --git a/xlators/cluster/afr/src/afr-self-heal-entry.c b/xlators/cluster/afr/src/afr-self-heal-entry.c index 254ff6d742c..963b7b8625c 100644 --- a/xlators/cluster/afr/src/afr-self-heal-entry.c +++ b/xlators/cluster/afr/src/afr-self-heal-entry.c @@ -249,8 +249,7 @@ afr_selfheal_detect_gfid_and_type_mismatch (xlator_t *this, uuid_utoa_r (replies[src_idx].poststat.ia_gfid, g2), priv->children[src_idx]->name); gf_event (EVENT_AFR_SPLIT_BRAIN, - "subvol=%s;msg=gfid mismatch. Skipping " - "conservative merge.;file=/%s>;count=2;" + "subvol=%s;type=gfid;file=/%s>;count=2;" "child-%d=%s;gfid-%d=%s;child-%d=%s;gfid-%d=%s", this->name, uuid_utoa (pargfid), bname, i, priv->children[i]->name, i, @@ -272,8 +271,7 @@ afr_selfheal_detect_gfid_and_type_mismatch (xlator_t *this, gf_inode_type_to_str (replies[src_idx].poststat.ia_type), priv->children[src_idx]->name); gf_event (EVENT_AFR_SPLIT_BRAIN, - "subvol=%s;msg=file type mismatch. Skipping " - "conservative merge;file=/%s>;count=2;" + "subvol=%s;type=file;file=/%s>;count=2;" "child-%d=%s;type-%d=%s;child-%d=%s;type-%d=%s", this->name, uuid_utoa (pargfid), bname, i, priv->children[i]->name, i, -- cgit