From 4aa08b618d71213a36b366d7d0b10236174acd0b Mon Sep 17 00:00:00 2001

From: Atin Mukherjee <amukherj@redhat.com>

Date: Sun, 14 May 2017 12:34:15 +0530

Subject: [PATCH 433/473] brick mux: Detach brick on posix health check failure

With brick mux enabled, we'd need to detach a particular brick if the

underlying backend has gone bad. This patch addresses the same.

>Reviewed-on: https://review.gluster.org/17287

>Smoke: Gluster Build System <jenkins@build.gluster.org>

>NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>

>CentOS-regression: Gluster Build System <jenkins@build.gluster.org>

>Reviewed-by: Jeff Darcy <jeff@pl.atyp.us>

Change-Id: Icfd469c7407cd2d21d02e4906375ec770afeacc3

BUG: 1450806

Signed-off-by: Atin Mukherjee <amukherj@redhat.com>

Reviewed-on: https://code.engineering.redhat.com/gerrit/106263

---

 configure.ac                              |  4 ++--

 glusterfsd/src/glusterfsd-mgmt.c          |  2 +-

 glusterfsd/src/glusterfsd.h               |  2 ++

 xlators/storage/posix/src/Makefile.am     |  2 +-

 xlators/storage/posix/src/posix-helpers.c | 25 ++++++++++++++++++++++---

 5 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac

index d51fa87..22272d4 100644

--- a/configure.ac

+++ b/configure.ac

@@ -282,10 +282,10 @@ AC_ARG_ENABLE([debug],

                              [Enable debug build options.]))

 if test "x$enable_debug" = "xyes"; then

         BUILD_DEBUG=yes

-        CFLAGS="${CFLAGS} -g -O0 -DDEBUG"

+        CFLAGS="${CFLAGS} -g -rdynamic -O0 -DDEBUG"

 else

         BUILD_DEBUG=no

-        CFLAGS="${CFLAGS} -g -O2"

+        CFLAGS="${CFLAGS} -g -rdynamic"

 fi

 case $host_os in

diff --git a/glusterfsd/src/glusterfsd-mgmt.c b/glusterfsd/src/glusterfsd-mgmt.c

index 607eac7..968570c 100644

--- a/glusterfsd/src/glusterfsd-mgmt.c

+++ b/glusterfsd/src/glusterfsd-mgmt.c

@@ -186,7 +186,7 @@ glusterfs_terminate_response_send (rpcsvc_request_t *req, int op_ret)

         return ret;

 }

-static void

+void

 glusterfs_autoscale_threads (glusterfs_ctx_t *ctx, int incr)

 {

         struct event_pool       *pool           = ctx->event_pool;

diff --git a/glusterfsd/src/glusterfsd.h b/glusterfsd/src/glusterfsd.h

index e13896d..4d697f3 100644

--- a/glusterfsd/src/glusterfsd.h

+++ b/glusterfsd/src/glusterfsd.h

@@ -122,6 +122,8 @@ int glusterfs_volume_top_write_perf (uint32_t blk_size, uint32_t blk_count,

 int glusterfs_volume_top_read_perf (uint32_t blk_size, uint32_t blk_count,

                                     char *brick_path, double *throughput,

                                     double *time);

+void

+glusterfs_autoscale_threads (glusterfs_ctx_t *ctx, int incr);

 extern glusterfs_ctx_t *glusterfsd_ctx;

 #endif /* __GLUSTERFSD_H__ */

diff --git a/xlators/storage/posix/src/Makefile.am b/xlators/storage/posix/src/Makefile.am

index 4e3fd3d..227bff2 100644

--- a/xlators/storage/posix/src/Makefile.am

+++ b/xlators/storage/posix/src/Makefile.am

@@ -15,7 +15,7 @@ AM_CPPFLAGS = $(GF_CPPFLAGS) -I$(top_srcdir)/libglusterfs/src \

             -I$(top_srcdir)/rpc/xdr/src \

             -I$(top_srcdir)/rpc/rpc-lib/src

-AM_CFLAGS = -fno-strict-aliasing -Wall $(GF_CFLAGS)

+AM_CFLAGS = -fno-strict-aliasing -Wall $(GF_CFLAGS) -I$(top_srcdir)/glusterfsd/src

 CLEANFILES =

diff --git a/xlators/storage/posix/src/posix-helpers.c b/xlators/storage/posix/src/posix-helpers.c

index 276ba3c..72f76c0 100644

--- a/xlators/storage/posix/src/posix-helpers.c

+++ b/xlators/storage/posix/src/posix-helpers.c

@@ -51,6 +51,7 @@

 #include "hashfn.h"

 #include "glusterfs-acl.h"

 #include "events.h"

+#include "glusterfsd.h"

 #include <sys/types.h>

 char *marker_xattrs[] = {"trusted.glusterfs.quota.*",

@@ -1843,9 +1844,11 @@ posix_health_check_thread_proc (void *data)

         struct posix_private *priv               = NULL;

         uint32_t              interval           = 0;

         int                   ret                = -1;

-        xlator_t                *top             = NULL;

-        xlator_list_t           **trav_p         = NULL;

-        int                     count            = 0;

+        xlator_t             *top                = NULL;

+        xlator_t             *victim             = NULL;

+        xlator_list_t       **trav_p             = NULL;

+        int                   count              = 0;

+        gf_boolean_t          victim_found       = _gf_false;

         this = data;

         priv = this->private;

@@ -1921,6 +1924,22 @@ abort:

                 if (ret == 0)

                         kill (getpid(), SIGKILL);

+        } else {

+                for (trav_p = &top->children; *trav_p;

+                     trav_p = &(*trav_p)->next) {

+                        victim = (*trav_p)->xlator;

+                        if (victim &&

+                            strcmp (victim->name, priv->base_path) == 0) {

+                                victim_found = _gf_true;

+                                break;

+                        }

+                }

+                if (victim_found) {

+                        top->notify (top, GF_EVENT_TRANSPORT_CLEANUP, victim);

+                        glusterfs_mgmt_pmap_signout (glusterfsd_ctx,

+                                                     priv->base_path);

+                        glusterfs_autoscale_threads (THIS->ctx, -1);

+                }

         }

         return NULL;

-- 

1.8.3.1