diff options
| author | Michael Adam <obnox@samba.org> | 2018-05-06 14:53:08 +0200 | 
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2018-05-08 00:17:20 +0000 | 
| commit | f8b6795b23aa23cc8e4af9159e6dd0dafc8b983b (patch) | |
| tree | 9ad063a14927b8e9988ed88742976bc03ce547b6 | |
| parent | 4b046827b99480e0cfabeaa75e593db13445176e (diff) | |
heal: improve output of heal info
The output of "gluster volume heal <volume> info" is clobbered with
extra new lines when messages "- Possibly undergoing heal" or " - Is in
split-brain" are printed for listed files.
This patch fixes the output by removing the extra new lines.
Bug: 1575381
Change-Id: Ifb614e0fb7c85f7af3a799958d3645a2bff2b53a
fixes: bz#1575381
Signed-off-by: Michael Adam <obnox@samba.org>
| -rw-r--r-- | heal/src/glfs-heal.c | 8 | 
1 files changed, 4 insertions, 4 deletions
diff --git a/heal/src/glfs-heal.c b/heal/src/glfs-heal.c index 930b08f8301..9c628016898 100644 --- a/heal/src/glfs-heal.c +++ b/heal/src/glfs-heal.c @@ -696,11 +696,11 @@ glfsh_print_heal_status (dict_t *dict, char *path, uuid_t gfid,                          goto out;          } else if (!strcmp (value, "possibly-healing")) {                  ret = gf_asprintf (&status, -                                   " - Possibly undergoing heal\n"); +                                   " - Possibly undergoing heal");                  if (ret < 0)                          goto out;          } else if (!strcmp (value, "split-brain")) { -                ret = gf_asprintf (&status, " - Is in split-brain\n"); +                ret = gf_asprintf (&status, " - Is in split-brain");                  if (ret < 0)                          goto out;          } else if (!strcmp (value, "heal-pending")) { @@ -710,13 +710,13 @@ glfsh_print_heal_status (dict_t *dict, char *path, uuid_t gfid,                          goto out;          } else if (!strcmp (value, "split-brain-pending")) {                  pending = _gf_true; -                ret = gf_asprintf (&status, " - Is in split-brain\n"); +                ret = gf_asprintf (&status, " - Is in split-brain");                  if (ret < 0)                          goto out;          } else if (!strcmp (value, "possibly-healing-pending")) {                  pending = _gf_true;                  ret = gf_asprintf (&status, -                                   " - Possibly undergoing heal\n"); +                                   " - Possibly undergoing heal");                  if (ret < 0)                          goto out;          }  | 
