|
 |
21ab4e |
From 950287141952ef176d133ff42fa4d60ab4c6f888 Mon Sep 17 00:00:00 2001
|
|
|
21ab4e |
From: Sunil Kumar H G <sheggodu@redhat.com>
|
|
|
21ab4e |
Date: Fri, 30 Dec 2016 14:11:15 +0530
|
|
|
21ab4e |
Subject: [PATCH 390/393] cluster/ec: Fixing log message
|
|
|
21ab4e |
|
|
|
21ab4e |
Updating the warning message with details to improve
|
|
|
21ab4e |
user understanding.
|
|
|
21ab4e |
|
|
|
21ab4e |
>BUG: 1409202
|
|
|
21ab4e |
>Signed-off-by: Sunil Kumar H G <sheggodu@redhat.com>
|
|
|
21ab4e |
>Reviewed-on: http://review.gluster.org/16315
|
|
|
21ab4e |
>Tested-by: Sunil Kumar Acharya
|
|
|
21ab4e |
>Smoke: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
|
|
|
21ab4e |
>Reviewed-by: Xavier Hernandez <xhernandez@datalab.es>
|
|
|
21ab4e |
|
|
|
21ab4e |
BUG: 1435592
|
|
|
21ab4e |
Change-Id: I001f8d5c01c97fff1e4e1a3a84b62e17c025c520
|
|
|
21ab4e |
Signed-off-by: Sunil Kumar Acharya <sheggodu@redhat.com>
|
|
|
21ab4e |
Reviewed-on: https://code.engineering.redhat.com/gerrit/101373
|
|
|
21ab4e |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
21ab4e |
---
|
|
|
21ab4e |
xlators/cluster/ec/src/ec-common.c | 17 ++++++++++++-----
|
|
|
21ab4e |
1 file changed, 12 insertions(+), 5 deletions(-)
|
|
|
21ab4e |
|
|
|
21ab4e |
diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c
|
|
|
21ab4e |
index f54084d..1720d88 100644
|
|
|
21ab4e |
--- a/xlators/cluster/ec/src/ec-common.c
|
|
|
21ab4e |
+++ b/xlators/cluster/ec/src/ec-common.c
|
|
|
21ab4e |
@@ -133,6 +133,7 @@ void ec_check_status(ec_fop_data_t * fop)
|
|
|
21ab4e |
{
|
|
|
21ab4e |
ec_t * ec = fop->xl->private;
|
|
|
21ab4e |
int32_t partial = 0;
|
|
|
21ab4e |
+ char str1[32], str2[32], str3[32], str4[32], str5[32];
|
|
|
21ab4e |
|
|
|
21ab4e |
if (!ec_fop_needs_name_heal (fop) && !ec_fop_needs_heal(fop)) {
|
|
|
21ab4e |
return;
|
|
|
21ab4e |
@@ -147,11 +148,17 @@ void ec_check_status(ec_fop_data_t * fop)
|
|
|
21ab4e |
}
|
|
|
21ab4e |
}
|
|
|
21ab4e |
|
|
|
21ab4e |
- gf_msg (fop->xl->name, GF_LOG_WARNING, 0, EC_MSG_OP_FAIL_ON_SUBVOLS,
|
|
|
21ab4e |
- "Operation failed on some subvolumes (up=%lX, mask=%lX, "
|
|
|
21ab4e |
- "remaining=%lX, good=%lX, bad=%lX)",
|
|
|
21ab4e |
- ec->xl_up, fop->mask, fop->remaining, fop->good,
|
|
|
21ab4e |
- ec->xl_up & ~(fop->remaining | fop->good));
|
|
|
21ab4e |
+ gf_msg (fop->xl->name, GF_LOG_WARNING, 0,
|
|
|
21ab4e |
+ EC_MSG_OP_FAIL_ON_SUBVOLS,
|
|
|
21ab4e |
+ "Operation failed on %d of %d subvolumes.(up=%s, mask=%s, "
|
|
|
21ab4e |
+ "remaining=%s, good=%s, bad=%s)",
|
|
|
21ab4e |
+ gf_bits_count(ec->xl_up & ~(fop->remaining | fop->good)), ec->nodes,
|
|
|
21ab4e |
+ ec_bin(str1, sizeof(str1), ec->xl_up, ec->nodes),
|
|
|
21ab4e |
+ ec_bin(str2, sizeof(str2), fop->mask, ec->nodes),
|
|
|
21ab4e |
+ ec_bin(str3, sizeof(str3), fop->remaining, ec->nodes),
|
|
|
21ab4e |
+ ec_bin(str4, sizeof(str4), fop->good, ec->nodes),
|
|
|
21ab4e |
+ ec_bin(str5, sizeof(str5),
|
|
|
21ab4e |
+ ec->xl_up & ~(fop->remaining | fop->good), ec->nodes));
|
|
|
21ab4e |
|
|
|
21ab4e |
if (fop->use_fd)
|
|
|
21ab4e |
{
|
|
|
21ab4e |
--
|
|
|
21ab4e |
1.8.3.1
|
|
|
21ab4e |
|