summaryrefslogtreecommitdiffstats
path: root/xlators
diff options
context:
space:
mode:
authorAvra Sengupta <asengupt@redhat.com>2015-06-17 14:18:32 +0530
committerRajesh Joseph <rjoseph@redhat.com>2015-06-24 02:09:06 -0700
commit2c541e1872df1f87c6946d33316228cbf332a3db (patch)
treeed7be63bad0e4939a938dbc195d66562b29724c0 /xlators
parenta635922b6f12ddde0c14fabb63be87fbf0f230c0 (diff)
glusterd/mgmt_v3: Print the node info, with failure messages
Backport of http://review.gluster.org/#/c/11234/ While reporting multiple failure messages from different nodes, print the node ip and the failure stage. Change-Id: I657d3debf1b509e4a27baf9e4b580f1ee32e3c5f BUG: 1232886 Signed-off-by: Avra Sengupta <asengupt@redhat.com> Reviewed-on: http://review.gluster.org/11293 Reviewed-by: Atin Mukherjee <amukherj@redhat.com> Tested-by: NetBSD Build System <jenkins@build.gluster.org> Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
Diffstat (limited to 'xlators')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-mgmt.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-mgmt.c
index f8e65acd2b5..41e639118f0 100644
--- a/xlators/mgmt/glusterd/src/glusterd-mgmt.c
+++ b/xlators/mgmt/glusterd/src/glusterd-mgmt.c
@@ -120,17 +120,15 @@ gd_mgmt_v3_collate_errors (struct syncargs *args, int op_ret, int op_errno,
err_string);
}
- cli_err_str = ((is_operrstr_blk) ? op_errstr : op_err);
-
if (args->errstr) {
len = snprintf (err_str, sizeof(err_str),
"%s\n%s", args->errstr,
- cli_err_str);
+ op_err);
GF_FREE (args->errstr);
args->errstr = NULL;
} else
len = snprintf (err_str, sizeof(err_str),
- "%s", cli_err_str);
+ "%s", op_err);
gf_msg (this->name, GF_LOG_ERROR, 0,
GD_MSG_MGMTV3_OP_FAIL, "%s", op_err);