From 61ad9dea00273f7d3c7ba893e17be04a5a29d48a Mon Sep 17 00:00:00 2001 From: Avra Sengupta Date: Wed, 17 Jun 2015 14:18:32 +0530 Subject: [PATCH 106/129] glusterd/mgmt_v3: Print the node info, with failure messages While reporting multiple failure messages from different nodes, print the node ip and the failure stage. >Reviewed-on: http://review.gluster.org/11234/ Change-Id: I657d3debf1b509e4a27baf9e4b580f1ee32e3c5f BUG: 1121560 Signed-off-by: Avra Sengupta Reviewed-on: https://code.engineering.redhat.com/gerrit/51039 Reviewed-by: Rajesh Joseph Tested-by: Rajesh Joseph --- xlators/mgmt/glusterd/src/glusterd-mgmt.c | 6 ++---- 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 f8e65ac..41e6391 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); -- 1.7.1