From 6e2318f0821d7c58eddc837b2d218247243a5c8d Mon Sep 17 00:00:00 2001 From: Atin Mukherjee Date: Fri, 26 Dec 2014 12:18:31 +0530 Subject: glusterd: cluster quorum count check correction Due to the recent change introduced by commit da9deb54df91dedc51ebe165f3a0be646455cb5b cluster quorum count calucation now depends on whether the peer list is either all peers or global transaction peer list or the local transaction peer list. Change-Id: I9f63af9a0cb3cfd6369b050247d0ef3ac93d760f BUG: 1173414 Signed-off-by: Atin Mukherjee Reviewed-on: http://review.gluster.org/9350 Tested-by: Gluster Build System Reviewed-by: Krishnan Parthasarathi Reviewed-by: Raghavendra Bhat Reviewed-by: Avra Sengupta Reviewed-by: Kaushal M --- xlators/mgmt/glusterd/src/glusterd-op-sm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'xlators/mgmt/glusterd/src/glusterd-op-sm.c') diff --git a/xlators/mgmt/glusterd/src/glusterd-op-sm.c b/xlators/mgmt/glusterd/src/glusterd-op-sm.c index 3f8de08a577..a0cf87598fa 100644 --- a/xlators/mgmt/glusterd/src/glusterd-op-sm.c +++ b/xlators/mgmt/glusterd/src/glusterd-op-sm.c @@ -3462,8 +3462,11 @@ glusterd_op_validate_quorum (xlator_t *this, glusterd_op_t op, int ret = 0; char *volname = NULL; glusterd_volinfo_t *volinfo = NULL; + glusterd_conf_t *conf = NULL; char *errstr = NULL; + conf = this->private; + GF_ASSERT (conf); errstr = "Quorum not met. Volume operation not allowed."; if (!glusterd_is_op_quorum_validation_required (this, op, dict)) @@ -3481,7 +3484,8 @@ glusterd_op_validate_quorum (xlator_t *this, glusterd_op_t op, goto out; } - if (does_gd_meet_server_quorum (this, _gf_false)) { + if (does_gd_meet_server_quorum (this, &conf->xaction_peers, + _gf_false)) { ret = 0; goto out; } -- cgit