diff options
| author | Ravishankar N <ravishankar@redhat.com> | 2016-09-23 15:16:46 +0530 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2016-09-23 07:45:25 -0700 |
| commit | f6a3c541941df6fd19ef57185aca5c4bcec2dec3 (patch) | |
| tree | 83cfcf93efde25e63d379eb17eb4e1ca7de81e3f /xlators/cluster/afr/src/afr-self-heal-entry.c | |
| parent | 85f7a86730db229ce264f43d224465a76202d270 (diff) | |
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 <ravishankar@redhat.com>
Reviewed-on: http://review.gluster.org/15550
Smoke: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr-self-heal-entry.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-entry.c | 6 |
1 files changed, 2 insertions, 4 deletions
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=<gfid:%s>/%s>;count=2;" + "subvol=%s;type=gfid;file=<gfid:%s>/%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=<gfid:%s>/%s>;count=2;" + "subvol=%s;type=file;file=<gfid:%s>/%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, |