|
 |
7f4c2a |
From 61ad9dea00273f7d3c7ba893e17be04a5a29d48a Mon Sep 17 00:00:00 2001
|
|
|
7f4c2a |
From: Avra Sengupta <asengupt@redhat.com>
|
|
|
7f4c2a |
Date: Wed, 17 Jun 2015 14:18:32 +0530
|
|
|
7f4c2a |
Subject: [PATCH 106/129] glusterd/mgmt_v3: Print the node info, with failure messages
|
|
|
7f4c2a |
|
|
|
7f4c2a |
While reporting multiple failure messages from different
|
|
|
7f4c2a |
nodes, print the node ip and the failure stage.
|
|
|
7f4c2a |
|
|
|
7f4c2a |
>Reviewed-on: http://review.gluster.org/11234/
|
|
|
7f4c2a |
Change-Id: I657d3debf1b509e4a27baf9e4b580f1ee32e3c5f
|
|
|
7f4c2a |
BUG: 1121560
|
|
|
7f4c2a |
Signed-off-by: Avra Sengupta <asengupt@redhat.com>
|
|
|
7f4c2a |
Reviewed-on: https://code.engineering.redhat.com/gerrit/51039
|
|
|
7f4c2a |
Reviewed-by: Rajesh Joseph <rjoseph@redhat.com>
|
|
|
7f4c2a |
Tested-by: Rajesh Joseph <rjoseph@redhat.com>
|
|
|
7f4c2a |
---
|
|
|
7f4c2a |
xlators/mgmt/glusterd/src/glusterd-mgmt.c | 6 ++----
|
|
|
7f4c2a |
1 files changed, 2 insertions(+), 4 deletions(-)
|
|
|
7f4c2a |
|
|
|
7f4c2a |
diff --git a/xlators/mgmt/glusterd/src/glusterd-mgmt.c b/xlators/mgmt/glusterd/src/glusterd-mgmt.c
|
|
|
7f4c2a |
index f8e65ac..41e6391 100644
|
|
|
7f4c2a |
--- a/xlators/mgmt/glusterd/src/glusterd-mgmt.c
|
|
|
7f4c2a |
+++ b/xlators/mgmt/glusterd/src/glusterd-mgmt.c
|
|
|
7f4c2a |
@@ -120,17 +120,15 @@ gd_mgmt_v3_collate_errors (struct syncargs *args, int op_ret, int op_errno,
|
|
|
7f4c2a |
err_string);
|
|
|
7f4c2a |
}
|
|
|
7f4c2a |
|
|
|
7f4c2a |
- cli_err_str = ((is_operrstr_blk) ? op_errstr : op_err);
|
|
|
7f4c2a |
-
|
|
|
7f4c2a |
if (args->errstr) {
|
|
|
7f4c2a |
len = snprintf (err_str, sizeof(err_str),
|
|
|
7f4c2a |
"%s\n%s", args->errstr,
|
|
|
7f4c2a |
- cli_err_str);
|
|
|
7f4c2a |
+ op_err);
|
|
|
7f4c2a |
GF_FREE (args->errstr);
|
|
|
7f4c2a |
args->errstr = NULL;
|
|
|
7f4c2a |
} else
|
|
|
7f4c2a |
len = snprintf (err_str, sizeof(err_str),
|
|
|
7f4c2a |
- "%s", cli_err_str);
|
|
|
7f4c2a |
+ "%s", op_err);
|
|
|
7f4c2a |
|
|
|
7f4c2a |
gf_msg (this->name, GF_LOG_ERROR, 0,
|
|
|
7f4c2a |
GD_MSG_MGMTV3_OP_FAIL, "%s", op_err);
|
|
|
7f4c2a |
--
|
|
|
7f4c2a |
1.7.1
|
|
|
7f4c2a |
|