diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2017-03-20 12:32:33 -0400 |
|---|---|---|
| committer | Raghavendra Talur <rtalur@redhat.com> | 2017-04-24 15:49:00 +0000 |
| commit | e6045103b7e010779549bb486c00a07b3c3eb0fc (patch) | |
| tree | 74a7d99741869208f9a2d54d18b8e3d9b8665959 /xlators/mgmt/glusterd/src/glusterd.c | |
| parent | e37d546042a73bec85fe2ebd0146b88b7079bc66 (diff) | |
glusterd: hold off volume deletes while still restarting bricks
We need to do this because modifying the volume/brick tree while
glusterd_restart_bricks is still walking it can lead to segfaults.
Without waiting we could accidentally "slip in" while attach_brick has
released big_lock between retries and make such a modification.
Backport of:
> Commit a7ce0548b7969050644891cd90c0bf134fa1594c
> BUG: 1432542
> Reviewed-on: https://review.gluster.org/16927
Change-Id: I30ccc4efa8d286aae847250f5d4fb28956a74b03
BUG: 1441476
Signed-off-by: Jeff Darcy <jeff@pl.atyp.us>
Reviewed-on: https://review.gluster.org/17044
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd.c')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd.c b/xlators/mgmt/glusterd/src/glusterd.c index 11d4b8bc79f..d26e959d3a3 100644 --- a/xlators/mgmt/glusterd/src/glusterd.c +++ b/xlators/mgmt/glusterd/src/glusterd.c @@ -1867,6 +1867,7 @@ init (xlator_t *this) if (ret < 0) goto out; + conf->blockers = 0; /* If the peer count is less than 2 then this would be the best time to * spawn process/bricks that may need (re)starting since last time * (this) glusterd was up. */ |