14f8ab
From 998d9b8b5e271f407e1c654c34f45f0db36abc71 Mon Sep 17 00:00:00 2001
14f8ab
From: Mohammed Rafi KC <rkavunga@redhat.com>
14f8ab
Date: Tue, 21 May 2019 17:15:07 +0530
14f8ab
Subject: [PATCH 172/178] ec/fini: Fix race with ec_fini and ec_notify
14f8ab
14f8ab
During a graph cleanup, we first sent a PARENT_DOWN and wait for
14f8ab
a child down to ultimately free the xlator and the graph.
14f8ab
14f8ab
In the ec xlator, we cleanup the threads when we get a PARENT_DOWN event.
14f8ab
But a racing event like CHILD_UP or event xl_op may trigger healing threads
14f8ab
after threads cleanup.
14f8ab
14f8ab
So there is a chance that the threads might access a freed private variabe
14f8ab
14f8ab
Upstream patch: https://review.gluster.org/#/c/glusterfs/+/22758/
14f8ab
14f8ab
>Change-Id: I252d10181bb67b95900c903d479de707a8489532
14f8ab
>fixes: bz#1703948
14f8ab
>Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
14f8ab
14f8ab
Change-Id: I84a10352d9fb3e68d4147b3791e3af45ab79050e
14f8ab
BUG: 1703434
14f8ab
Signed-off-by: Mohammed Rafi KC <rkavunga@redhat.com>
14f8ab
Reviewed-on: https://code.engineering.redhat.com/gerrit/172285
14f8ab
Tested-by: RHGS Build Bot <nigelb@redhat.com>
14f8ab
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
14f8ab
---
14f8ab
 libglusterfs/src/glusterfs/xlator.h |  3 +++
14f8ab
 libglusterfs/src/libglusterfs.sym   |  1 +
14f8ab
 libglusterfs/src/xlator.c           | 21 +++++++++++++++++++++
14f8ab
 xlators/cluster/ec/src/ec-heal.c    |  4 ++++
14f8ab
 xlators/cluster/ec/src/ec-heald.c   |  6 ++++++
14f8ab
 xlators/cluster/ec/src/ec.c         |  3 +++
14f8ab
 6 files changed, 38 insertions(+)
14f8ab
14f8ab
diff --git a/libglusterfs/src/glusterfs/xlator.h b/libglusterfs/src/glusterfs/xlator.h
14f8ab
index 8998976..09e463e 100644
14f8ab
--- a/libglusterfs/src/glusterfs/xlator.h
14f8ab
+++ b/libglusterfs/src/glusterfs/xlator.h
14f8ab
@@ -1092,4 +1092,7 @@ gluster_graph_take_reference(xlator_t *tree);
14f8ab
 
14f8ab
 gf_boolean_t
14f8ab
 mgmt_is_multiplexed_daemon(char *name);
14f8ab
+
14f8ab
+gf_boolean_t
14f8ab
+xlator_is_cleanup_starting(xlator_t *this);
14f8ab
 #endif /* _XLATOR_H */
14f8ab
diff --git a/libglusterfs/src/libglusterfs.sym b/libglusterfs/src/libglusterfs.sym
14f8ab
index ec474e7..7a2edef 100644
14f8ab
--- a/libglusterfs/src/libglusterfs.sym
14f8ab
+++ b/libglusterfs/src/libglusterfs.sym
14f8ab
@@ -1161,3 +1161,4 @@ glusterfs_process_svc_attach_volfp
14f8ab
 glusterfs_mux_volfile_reconfigure
14f8ab
 glusterfs_process_svc_detach
14f8ab
 mgmt_is_multiplexed_daemon
14f8ab
+xlator_is_cleanup_starting
14f8ab
diff --git a/libglusterfs/src/xlator.c b/libglusterfs/src/xlator.c
14f8ab
index 022c3ed..fbfbbe2 100644
14f8ab
--- a/libglusterfs/src/xlator.c
14f8ab
+++ b/libglusterfs/src/xlator.c
14f8ab
@@ -1486,3 +1486,24 @@ mgmt_is_multiplexed_daemon(char *name)
14f8ab
     }
14f8ab
     return _gf_false;
14f8ab
 }
14f8ab
+
14f8ab
+gf_boolean_t
14f8ab
+xlator_is_cleanup_starting(xlator_t *this)
14f8ab
+{
14f8ab
+    gf_boolean_t cleanup = _gf_false;
14f8ab
+    glusterfs_graph_t *graph = NULL;
14f8ab
+    xlator_t *xl = NULL;
14f8ab
+
14f8ab
+    if (!this)
14f8ab
+        goto out;
14f8ab
+    graph = this->graph;
14f8ab
+
14f8ab
+    if (!graph)
14f8ab
+        goto out;
14f8ab
+
14f8ab
+    xl = graph->first;
14f8ab
+    if (xl && xl->cleanup_starting)
14f8ab
+        cleanup = _gf_true;
14f8ab
+out:
14f8ab
+    return cleanup;
14f8ab
+}
14f8ab
diff --git a/xlators/cluster/ec/src/ec-heal.c b/xlators/cluster/ec/src/ec-heal.c
14f8ab
index 2fa1f11..8844c29 100644
14f8ab
--- a/xlators/cluster/ec/src/ec-heal.c
14f8ab
+++ b/xlators/cluster/ec/src/ec-heal.c
14f8ab
@@ -2855,6 +2855,10 @@ ec_replace_brick_heal_wrap(void *opaque)
14f8ab
         itable = ec->xl->itable;
14f8ab
     else
14f8ab
         goto out;
14f8ab
+
14f8ab
+    if (xlator_is_cleanup_starting(ec->xl))
14f8ab
+        goto out;
14f8ab
+
14f8ab
     ret = ec_replace_heal(ec, itable->root);
14f8ab
 out:
14f8ab
     return ret;
14f8ab
diff --git a/xlators/cluster/ec/src/ec-heald.c b/xlators/cluster/ec/src/ec-heald.c
14f8ab
index edf5e11..91512d7 100644
14f8ab
--- a/xlators/cluster/ec/src/ec-heald.c
14f8ab
+++ b/xlators/cluster/ec/src/ec-heald.c
14f8ab
@@ -444,6 +444,9 @@ unlock:
14f8ab
 int
14f8ab
 ec_shd_full_healer_spawn(xlator_t *this, int subvol)
14f8ab
 {
14f8ab
+    if (xlator_is_cleanup_starting(this))
14f8ab
+        return -1;
14f8ab
+
14f8ab
     return ec_shd_healer_spawn(this, NTH_FULL_HEALER(this, subvol),
14f8ab
                                ec_shd_full_healer);
14f8ab
 }
14f8ab
@@ -451,6 +454,9 @@ ec_shd_full_healer_spawn(xlator_t *this, int subvol)
14f8ab
 int
14f8ab
 ec_shd_index_healer_spawn(xlator_t *this, int subvol)
14f8ab
 {
14f8ab
+    if (xlator_is_cleanup_starting(this))
14f8ab
+        return -1;
14f8ab
+
14f8ab
     return ec_shd_healer_spawn(this, NTH_INDEX_HEALER(this, subvol),
14f8ab
                                ec_shd_index_healer);
14f8ab
 }
14f8ab
diff --git a/xlators/cluster/ec/src/ec.c b/xlators/cluster/ec/src/ec.c
14f8ab
index 264582a..df5912c 100644
14f8ab
--- a/xlators/cluster/ec/src/ec.c
14f8ab
+++ b/xlators/cluster/ec/src/ec.c
14f8ab
@@ -486,6 +486,9 @@ ec_set_up_state(ec_t *ec, uintptr_t index_mask, uintptr_t new_state)
14f8ab
 {
14f8ab
     uintptr_t current_state = 0;
14f8ab
 
14f8ab
+    if (xlator_is_cleanup_starting(ec->xl))
14f8ab
+        return _gf_false;
14f8ab
+
14f8ab
     if ((ec->xl_notify & index_mask) == 0) {
14f8ab
         ec->xl_notify |= index_mask;
14f8ab
         ec->xl_notify_count++;
14f8ab
-- 
14f8ab
1.8.3.1
14f8ab