233933
From a325e7b3bbe5c1f67b999f375b83d2e2f1b2c1c6 Mon Sep 17 00:00:00 2001
233933
From: Sanju Rakonde <srakonde@redhat.com>
233933
Date: Tue, 9 Apr 2019 13:56:24 +0530
233933
Subject: [PATCH 119/124] glusterd: provide a way to detach failed node
233933
233933
When a gluster node in trusted storage pool has failed
233933
due to hardware issues, volume delete operation fails
233933
saying "Not all peers are up" and peer detach for failed
233933
node fails saying "Brick(s) with peer <peer_ip> exists
233933
in cluster".
233933
233933
The idea here is to use either replace-brick or remove-brick
233933
command to remove all the bricks hosted by failed node and
233933
then re-attempting the peer detach. This change adds this
233933
trick in peer detach error message.
233933
233933
> upstream patch : https://review.gluster.org/22534
233933
233933
>fixes: bz#1697866
233933
>Change-Id: I0c58887479d31db603ad8d6535ea9d547880ccc8
233933
>Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
233933
233933
BUG: 1696334
233933
Change-Id: I0c58887479d31db603ad8d6535ea9d547880ccc8
233933
Signed-off-by: Sanju Rakonde <srakonde@redhat.com>
233933
Reviewed-on: https://code.engineering.redhat.com/gerrit/168614
233933
Tested-by: RHGS Build Bot <nigelb@redhat.com>
233933
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
233933
---
233933
 xlators/mgmt/glusterd/src/glusterd-handler.c | 7 +++++--
233933
 1 file changed, 5 insertions(+), 2 deletions(-)
233933
233933
diff --git a/xlators/mgmt/glusterd/src/glusterd-handler.c b/xlators/mgmt/glusterd/src/glusterd-handler.c
233933
index 6147995..af8a8a4 100644
233933
--- a/xlators/mgmt/glusterd/src/glusterd-handler.c
233933
+++ b/xlators/mgmt/glusterd/src/glusterd-handler.c
233933
@@ -4134,8 +4134,11 @@ set_deprobe_error_str(int op_ret, int op_errno, char *op_errstr, char *errstr,
233933
 
233933
             case GF_DEPROBE_BRICK_EXIST:
233933
                 snprintf(errstr, len,
233933
-                         "Brick(s) with the peer "
233933
-                         "%s exist in cluster",
233933
+                         "Peer %s hosts one or more bricks. If the peer is in "
233933
+                         "not recoverable state then use either replace-brick "
233933
+                         "or remove-brick command with force to remove all "
233933
+                         "bricks from the peer and attempt the peer detach "
233933
+                         "again.",
233933
                          hostname);
233933
                 break;
233933
 
233933
-- 
233933
1.8.3.1
233933