diff options
| author | Krishnan Parthasarathi <kparthas@redhat.com> | 2015-01-27 16:44:20 +0530 |
|---|---|---|
| committer | Kaushal M <kaushal@redhat.com> | 2015-04-02 10:58:13 -0700 |
| commit | f66a85a484d41e68611f68d70e458c67f484d2e1 (patch) | |
| tree | 6c0f9d051c987814b1c5e034f094a97a8c9c2e13 /xlators/mgmt/glusterd/src/glusterd-server-quorum.h | |
| parent | 08d35497e30714058002b4b0095171f1dad73ddc (diff) | |
glusterd: compute quorum on peers in cluster
... and not on peers participating in an ongoing
transaction.
Change-Id: I6bdb80fd3bf3e7593fdf37e45a441d4a490469b8
BUG: 1205592
Signed-off-by: Kaushal M <kaushal@redhat.com>
Reviewed-on: http://review.gluster.org/9493
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'xlators/mgmt/glusterd/src/glusterd-server-quorum.h')
| -rw-r--r-- | xlators/mgmt/glusterd/src/glusterd-server-quorum.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/xlators/mgmt/glusterd/src/glusterd-server-quorum.h b/xlators/mgmt/glusterd/src/glusterd-server-quorum.h index 509a60d9f31..f43cdbbca10 100644 --- a/xlators/mgmt/glusterd/src/glusterd-server-quorum.h +++ b/xlators/mgmt/glusterd/src/glusterd-server-quorum.h @@ -15,18 +15,6 @@ #include "config.h" #endif -#define GLUSTERD_QUORUM_COUNT(peerinfo, inquorum_count,\ - active_count, _exit)\ -do {\ - if (peerinfo->quorum_contrib == QUORUM_WAITING)\ - goto _exit;\ - if (_is_contributing_to_quorum (peerinfo->quorum_contrib))\ - inquorum_count = inquorum_count + 1;\ - if (active_count && (peerinfo->quorum_contrib == QUORUM_UP))\ - *active_count = *active_count + 1;\ -} while (0) - - int glusterd_validate_quorum (xlator_t *this, glusterd_op_t op, dict_t *dict, char **op_errstr); @@ -39,9 +27,7 @@ glusterd_do_quorum_action (); int glusterd_get_quorum_cluster_counts (xlator_t *this, int *active_count, - int *quorum_count, - struct cds_list_head *peer_list, - gf_boolean_t _local__xaction_peers); + int *quorum_count); gf_boolean_t glusterd_is_quorum_option (char *option); @@ -53,7 +39,5 @@ gf_boolean_t glusterd_is_any_volume_in_server_quorum (xlator_t *this); gf_boolean_t -does_gd_meet_server_quorum (xlator_t *this, - struct cds_list_head *peers_list, - gf_boolean_t _local__xaction_peers); +does_gd_meet_server_quorum (xlator_t *this); #endif /* _GLUSTERD_SERVER_QUORUM_H */ |