From 950287141952ef176d133ff42fa4d60ab4c6f888 Mon Sep 17 00:00:00 2001
From: Sunil Kumar H G <sheggodu@redhat.com>
Date: Fri, 30 Dec 2016 14:11:15 +0530
Subject: [PATCH 390/393] cluster/ec: Fixing log message

Updating the warning message with details to improve
user understanding.

>BUG: 1409202
>Signed-off-by: Sunil Kumar H G <sheggodu@redhat.com>
>Reviewed-on: http://review.gluster.org/16315
>Tested-by: Sunil Kumar Acharya
>Smoke: Gluster Build System <jenkins@build.gluster.org>
>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
>Reviewed-by: Xavier Hernandez <xhernandez@datalab.es>

BUG: 1435592
Change-Id: I001f8d5c01c97fff1e4e1a3a84b62e17c025c520
Signed-off-by: Sunil Kumar Acharya <sheggodu@redhat.com>
Reviewed-on: https://code.engineering.redhat.com/gerrit/101373
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
---
 xlators/cluster/ec/src/ec-common.c | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/xlators/cluster/ec/src/ec-common.c b/xlators/cluster/ec/src/ec-common.c
index f54084d..1720d88 100644
--- a/xlators/cluster/ec/src/ec-common.c
+++ b/xlators/cluster/ec/src/ec-common.c
@@ -133,6 +133,7 @@ void ec_check_status(ec_fop_data_t * fop)
 {
     ec_t * ec = fop->xl->private;
     int32_t partial = 0;
+    char str1[32], str2[32], str3[32], str4[32], str5[32];
 
     if (!ec_fop_needs_name_heal (fop) && !ec_fop_needs_heal(fop)) {
         return;
@@ -147,11 +148,17 @@ void ec_check_status(ec_fop_data_t * fop)
         }
     }
 
-    gf_msg (fop->xl->name, GF_LOG_WARNING, 0, EC_MSG_OP_FAIL_ON_SUBVOLS,
-            "Operation failed on some subvolumes (up=%lX, mask=%lX, "
-            "remaining=%lX, good=%lX, bad=%lX)",
-            ec->xl_up, fop->mask, fop->remaining, fop->good,
-            ec->xl_up & ~(fop->remaining | fop->good));
+    gf_msg (fop->xl->name, GF_LOG_WARNING, 0,
+            EC_MSG_OP_FAIL_ON_SUBVOLS,
+            "Operation failed on %d of %d subvolumes.(up=%s, mask=%s, "
+            "remaining=%s, good=%s, bad=%s)",
+            gf_bits_count(ec->xl_up & ~(fop->remaining | fop->good)), ec->nodes,
+            ec_bin(str1, sizeof(str1), ec->xl_up, ec->nodes),
+            ec_bin(str2, sizeof(str2), fop->mask, ec->nodes),
+            ec_bin(str3, sizeof(str3), fop->remaining, ec->nodes),
+            ec_bin(str4, sizeof(str4), fop->good, ec->nodes),
+            ec_bin(str5, sizeof(str5),
+            ec->xl_up & ~(fop->remaining | fop->good), ec->nodes));
 
     if (fop->use_fd)
     {
-- 
1.8.3.1