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