From a4b622e0bd60a5e19e73f415a6a64aa6661a971a Mon Sep 17 00:00:00 2001
From: Pranith Kumar K <pkarampu@redhat.com>
Date: Mon, 5 May 2014 11:28:25 +0530
Subject: 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>
---
 xlators/mgmt/glusterd/src/glusterd-syncop.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'xlators/mgmt/glusterd')

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;
 }
 
-- 
cgit