diff options
| author | Anuradha <atalur@redhat.com> | 2014-11-13 10:59:52 +0530 |
|---|---|---|
| committer | Niels de Vos <ndevos@redhat.com> | 2014-11-13 11:55:41 -0800 |
| commit | c11c9deb3cf77101c7e440522ab8f5961f815222 (patch) | |
| tree | f30ae75a9763243f9aa6baf2a6b2eee4ad5749b6 /xlators/cluster/afr/src/afr-self-heal-common.c | |
| parent | 909eb5671db37ff1388613929fe22883a4677da0 (diff) | |
cluster/afr : Prevent excessive logging of split-brain messages.
Running the volume heal info command would result in
excessive logging of split-brain messages. After this patch,
running heal info command will not log the split brain messages.
This info is now displayed in the output of heal info command
instead.
If a file is in split-brain, a message "Is in split-brain"
will be written against its name.
Change-Id: Ib8979be04f5ac7c59ce3ad1185886bb54b8be808
BUG: 1161102
Signed-off-by: Anuradha <atalur@redhat.com>
Reviewed-on: http://review.gluster.org/9069
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr-self-heal-common.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr-self-heal-common.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/xlators/cluster/afr/src/afr-self-heal-common.c b/xlators/cluster/afr/src/afr-self-heal-common.c index 5f47a4cc410..d50914fa103 100644 --- a/xlators/cluster/afr/src/afr-self-heal-common.c +++ b/xlators/cluster/afr/src/afr-self-heal-common.c @@ -216,12 +216,15 @@ out: void afr_sh_print_split_brain_log (int32_t *pending_matrix[], xlator_t *this, - const char *loc, afr_spb_state_t mdata, + afr_local_t *local, afr_spb_state_t mdata, afr_spb_state_t data) { char *buf = NULL; char *free_ptr = NULL; + if (local->self_heal.dry_run) + return; + buf = afr_get_pending_matrix_str (pending_matrix, this); if (buf) free_ptr = buf; @@ -231,8 +234,8 @@ afr_sh_print_split_brain_log (int32_t *pending_matrix[], xlator_t *this, gf_log (this->name, GF_LOG_ERROR, "Unable to self-heal contents of '%s'" " (possible %s split-brain). Please delete the file from all but " - "the preferred subvolume.%s", loc, (mdata == SPB) ? "metadata" : - (data == SPB) ? "data" : "", buf); + "the preferred subvolume.%s", local->loc.path, (mdata == SPB) ? + "metadata" : (data == SPB) ? "data" : "", buf); GF_FREE (free_ptr); return; } |