47 lines
1.9 KiB
Diff
47 lines
1.9 KiB
Diff
From c5bde98eb28ed3ae6707b7eca3c95f4e5e386c23 Mon Sep 17 00:00:00 2001
|
|
From: Mohit Agrawal <moagrawa@redhat.com>
|
|
Date: Wed, 26 Sep 2018 15:23:28 +0530
|
|
Subject: [PATCH 392/399] glusterd: don't wait for blockers flag for stop
|
|
volume
|
|
|
|
With commit 4f6ae8 even though the overall transaction time for gluster
|
|
volume stop can be reduced, but based on testing it can't be guaranteed
|
|
that the transaction can finish in 3 minutes before the unlock timer
|
|
gets kicked in. The ground problem to this is the command serialization
|
|
which atomic field 'blockers' does for volume stop operation.
|
|
|
|
This patch removes that dependency for volume stop not to wait for
|
|
blockers.
|
|
|
|
> Change-Id: Ifaf120115dc7ed21cf21e65e25c4ec7c61ab8258
|
|
> Fixes: bz#1631128
|
|
> Signed-off-by: Atin Mukherjee <amukherj@redhat.com>
|
|
> (Cherry picked from commit f72f18b3bf7f9535827a059a5090476b3141723f)
|
|
> (Reviewed on upstream link https://review.gluster.org/#/c/glusterfs/+/21242/)
|
|
|
|
Change-Id: Ia3cb4d812ea1c633b7a501a03e0bf25a20b45a8e
|
|
BUG: 1631329
|
|
Signed-off-by: Mohit Agrawal <moagrawa@redhat.com>
|
|
Reviewed-on: https://code.engineering.redhat.com/gerrit/151065
|
|
Tested-by: RHGS Build Bot <nigelb@redhat.com>
|
|
Reviewed-by: Sunil Kumar Heggodu Gopala Acharya <sheggodu@redhat.com>
|
|
---
|
|
xlators/mgmt/glusterd/src/glusterd-op-sm.c | 1 -
|
|
1 file changed, 1 deletion(-)
|
|
|
|
diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
|
|
index df5b5c2..716d3f2 100644
|
|
--- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c
|
|
+++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c
|
|
@@ -6286,7 +6286,6 @@ glusterd_op_commit_perform (glusterd_op_t op, dict_t *dict, char **op_errstr,
|
|
break;
|
|
|
|
case GD_OP_STOP_VOLUME:
|
|
- glusterd_wait_for_blockers (this->private);
|
|
ret = glusterd_op_stop_volume (dict);
|
|
break;
|
|
|
|
--
|
|
1.8.3.1
|
|
|