Add command-line support (but no doc) for enforce-quorum option.

Change-Id: Ia52ddb551e24c27969f7f5fa0f94c1044789731f
BUG: 3823
Reviewed-on: http://review.gluster.com/743
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>

1 files changed, 30 insertions, 25 deletions

diff --git a/xlators/cluster/afr/src/afr-common.c b/xlators/cluster/afr/src/afr-common.c
index 9512f6a5477..209024bbeda 100644
--- a/xlators/cluster/afr/src/afr-common.c
+++ b/xlators/cluster/afr/src/afr-common.c
@@ -3893,31 +3893,36 @@ out:
 gf_boolean_t
 afr_have_quorum (char *logname, afr_private_t *priv)
 {
-	unsigned int	quorum = 0;
-
-	GF_VALIDATE_OR_GOTO(logname,priv,out);
-
-	quorum = priv->child_count / 2 + 1;
-	if (priv->up_count >= (priv->down_count + quorum)) {
-		return _gf_true;
-	}
-
-	/*
-	 * Special case for even numbers of nodes: if we have exactly half
-	 * and that includes the first ("senior-most") node, then that counts
-	 * as quorum even if it wouldn't otherwise.  This supports e.g. N=2
-	 * while preserving the critical property that there can only be one
-	 * such group.
-	 */
-	if ((priv->child_count % 2) == 0) {
-		quorum = priv->child_count / 2;
-		if (priv->up_count >= (priv->down_count + quorum)) {
-			if (priv->child_up[0]) {
-				return _gf_true;
-			}
-		}
-	}
+        unsigned int        quorum = 0;
+
+        GF_VALIDATE_OR_GOTO(logname,priv,out);
+
+        quorum = priv->quorum_count;
+        if (quorum != AFR_QUORUM_AUTO) {
+                return (priv->up_count >= (priv->down_count + quorum));
+        }
+
+        quorum = priv->child_count / 2 + 1;
+        if (priv->up_count >= (priv->down_count + quorum)) {
+                return _gf_true;
+        }
+
+        /*
+         * Special case for even numbers of nodes: if we have exactly half
+         * and that includes the first ("senior-most") node, then that counts
+         * as quorum even if it wouldn't otherwise.  This supports e.g. N=2
+         * while preserving the critical property that there can only be one
+         * such group.
+         */
+        if ((priv->child_count % 2) == 0) {
+                quorum = priv->child_count / 2;
+                if (priv->up_count >= (priv->down_count + quorum)) {
+                        if (priv->child_up[0]) {
+                                return _gf_true;
+                        }
+                }
+        }
 
 out:
-	return _gf_false;
+        return _gf_false;
 }