diff options
| author | Jeff Darcy <jdarcy@redhat.com> | 2016-11-17 10:42:02 -0500 |
|---|---|---|
| committer | Pranith Kumar Karampuri <pkarampu@redhat.com> | 2016-11-28 22:41:24 -0800 |
| commit | 77f03db0131c88d607886bb02dd2a4276ab584d4 (patch) | |
| tree | 8a3c464e02f2c9b391c94281821a2c8605c8c612 /xlators/cluster/afr/src/afr.c | |
| parent | 1876454d2e7950f25d1e5bb8e2c07ab27d521498 (diff) | |
afr: fix auto-quorum
(1) afr_have_quorum is dead code. It was copied to afr_has_quorum,
and everything else uses that, but the original was never deleted
(until now).
(2) Auto-quorum should be default for any N>2. Leaving quorum
disabled is BAD, but apparently deemed acceptable for N=2 because
there's no real quorum in that case. For any larger number (including
arbiter configurations) there is such a thing as real quorum and we
should use it by default. Note that for N=3 the answers we get from
"N % 2" (the old check) and "N > 2" (the new one) are the same.
(3) The special case for even N in afr_has_quorum has been simplified and
explained more thoroughly in a comment.
Change-Id: I48b33c15093512fecf516b26dcf09afecb7ae33b
Signed-off-by: Jeff Darcy <jdarcy@redhat.com>
Reviewed-on: http://review.gluster.org/15873
Smoke: Gluster Build System <jenkins@build.gluster.org>
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Vijay Bellur <vbellur@redhat.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Reviewed-by: Pranith Kumar Karampuri <pkarampu@redhat.com>
Diffstat (limited to 'xlators/cluster/afr/src/afr.c')
| -rw-r--r-- | xlators/cluster/afr/src/afr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xlators/cluster/afr/src/afr.c b/xlators/cluster/afr/src/afr.c index 0dbb209df1b..1df45b5a68f 100644 --- a/xlators/cluster/afr/src/afr.c +++ b/xlators/cluster/afr/src/afr.c @@ -91,8 +91,8 @@ fix_quorum_options (xlator_t *this, afr_private_t *priv, char *qtype, { if (dict_get (options, "quorum-type") == NULL) { /* If user doesn't configure anything enable auto-quorum if the - * replica has odd number of subvolumes */ - if (priv->child_count % 2) + * replica has more than two subvolumes */ + if (priv->child_count > 2) qtype = "auto"; } |