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