summaryrefslogtreecommitdiffstats
path: root/xlators/mgmt/glusterd/src
diff options
context:
space:
mode:
authorPranith Kumar K <pkarampu@redhat.com>2014-05-05 11:28:25 +0530
committerKaushal M <kaushal@redhat.com>2014-05-08 04:08:56 -0700
commita4b622e0bd60a5e19e73f415a6a64aa6661a971a (patch)
treeb87c441ac8e0c2704200dcfe7d69c80f11887ced /xlators/mgmt/glusterd/src
parente80daecc3dd3023f010c785ff0e238fc92214477 (diff)
mgmt/glusterd: Perform Pending quorum actions after Op
Change-Id: I2bb67b5fb4a6f6dac892ef3206e7a79706018a6e BUG: 959986 Signed-off-by: Pranith Kumar K <pkarampu@redhat.com> Reviewed-on: http://review.gluster.org/4955 Tested-by: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: Kaushal M <kaushal@redhat.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src')
-rw-r--r--xlators/mgmt/glusterd/src/glusterd-syncop.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-syncop.c b/xlators/mgmt/glusterd/src/glusterd-syncop.c
index 998af71b524..30fbda47117 100644
--- a/xlators/mgmt/glusterd/src/glusterd-syncop.c
+++ b/xlators/mgmt/glusterd/src/glusterd-syncop.c
@@ -1441,6 +1441,13 @@ out:
if (!*op_ret)
*op_ret = ret;
+ /*
+ * If there are any quorum events while the OP is in progress, process
+ * them.
+ */
+ if (conf->pending_quorum_action)
+ glusterd_do_quorum_action ();
+
return 0;
}