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