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