|
 |
1df6c8 |
From e06882a7fea9720a2899f7d52d5d3866ff098866 Mon Sep 17 00:00:00 2001
|
|
|
1df6c8 |
From: Xavi Hernandez <xhernandez@redhat.com>
|
|
|
1df6c8 |
Date: Thu, 21 May 2020 08:26:11 +0200
|
|
|
1df6c8 |
Subject: [PATCH 379/379] glusterd: add missing synccond_broadcast()
|
|
|
1df6c8 |
|
|
|
1df6c8 |
After the changes in commit 3da22f8cb08b05562a4c6bd2694f2f19199cff7f,
|
|
|
1df6c8 |
there was a place where synccond_broadcast() was missing. It could
|
|
|
1df6c8 |
cause a hang if another synctask was waiting on the condition variable.
|
|
|
1df6c8 |
|
|
|
1df6c8 |
Upstream patch:
|
|
|
1df6c8 |
> Upstream patch link: https://review.gluster.org/c/glusterfs/+/24476
|
|
|
1df6c8 |
> Change-Id: I92bfe4e15c5c3591e4854a64aa9e1566d50dd204
|
|
|
1df6c8 |
> Fixes: #1116
|
|
|
1df6c8 |
> Signed-off-by: Xavi Hernandez <xhernandez@redhat.com>
|
|
|
1df6c8 |
|
|
|
1df6c8 |
Change-Id: I92bfe4e15c5c3591e4854a64aa9e1566d50dd204
|
|
|
1df6c8 |
BUG: 1810516
|
|
|
1df6c8 |
Signed-off-by: Xavi Hernandez <xhernandez@redhat.com>
|
|
|
1df6c8 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/201057
|
|
|
1df6c8 |
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
|
1df6c8 |
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
|
1df6c8 |
---
|
|
|
1df6c8 |
xlators/mgmt/glusterd/src/glusterd-utils.c | 4 +++-
|
|
|
1df6c8 |
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
1df6c8 |
|
|
|
1df6c8 |
diff --git a/xlators/mgmt/glusterd/src/glusterd-utils.c b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
1df6c8 |
index ce9931c..c92cdf3 100644
|
|
|
1df6c8 |
--- a/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
1df6c8 |
+++ b/xlators/mgmt/glusterd/src/glusterd-utils.c
|
|
|
1df6c8 |
@@ -6797,9 +6797,11 @@ glusterd_restart_bricks(void *opaque)
|
|
|
1df6c8 |
ret = 0;
|
|
|
1df6c8 |
|
|
|
1df6c8 |
out:
|
|
|
1df6c8 |
- GF_ATOMIC_DEC(conf->blockers);
|
|
|
1df6c8 |
conf->restart_done = _gf_true;
|
|
|
1df6c8 |
conf->restart_bricks = _gf_false;
|
|
|
1df6c8 |
+ if (GF_ATOMIC_DEC(conf->blockers) == 0) {
|
|
|
1df6c8 |
+ synccond_broadcast(&conf->cond_blockers);
|
|
|
1df6c8 |
+ }
|
|
|
1df6c8 |
synccond_broadcast(&conf->cond_restart_bricks);
|
|
|
1df6c8 |
|
|
|
1df6c8 |
return_block:
|
|
|
1df6c8 |
--
|
|
|
1df6c8 |
1.8.3.1
|
|
|
1df6c8 |
|