|
 |
3062ca |
From 4a385f2e94c7168dbd92168c54a80ee97a3c2140 Mon Sep 17 00:00:00 2001
|
|
|
3062ca |
From: Christine Caulfield <ccaulfie@redhat.com>
|
|
|
3062ca |
Date: Tue, 13 Sep 2016 15:55:58 +0100
|
|
|
3062ca |
Subject: [PATCH] votequorum: simplify reconfigure message handling
|
|
|
3062ca |
|
|
|
3062ca |
As we now have update_node_expected_votes(), we can use that
|
|
|
3062ca |
when receiving a new EXPECTED_VOTES value from another node
|
|
|
3062ca |
rather than having our own loop.
|
|
|
3062ca |
|
|
|
3062ca |
Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
|
|
|
3062ca |
(cherry picked from commit c4683be9b0bafec7f288c0201b82c90d0c43d5ce)
|
|
|
3062ca |
---
|
|
|
3062ca |
exec/votequorum.c | 9 ++-------
|
|
|
3062ca |
1 files changed, 2 insertions(+), 7 deletions(-)
|
|
|
3062ca |
|
|
|
3062ca |
diff --git a/exec/votequorum.c b/exec/votequorum.c
|
|
|
3062ca |
index 405350f..f61aa81 100644
|
|
|
3062ca |
--- a/exec/votequorum.c
|
|
|
3062ca |
+++ b/exec/votequorum.c
|
|
|
3062ca |
@@ -2158,7 +2158,6 @@ static void message_handler_req_exec_votequorum_reconfigure (
|
|
|
3062ca |
{
|
|
|
3062ca |
const struct req_exec_quorum_reconfigure *req_exec_quorum_reconfigure = message;
|
|
|
3062ca |
struct cluster_node *node;
|
|
|
3062ca |
- struct list_head *nodelist;
|
|
|
3062ca |
|
|
|
3062ca |
ENTER();
|
|
|
3062ca |
|
|
|
3062ca |
@@ -2168,12 +2167,8 @@ static void message_handler_req_exec_votequorum_reconfigure (
|
|
|
3062ca |
switch(req_exec_quorum_reconfigure->param)
|
|
|
3062ca |
{
|
|
|
3062ca |
case VOTEQUORUM_RECONFIG_PARAM_EXPECTED_VOTES:
|
|
|
3062ca |
- list_iterate(nodelist, &cluster_members_list) {
|
|
|
3062ca |
- node = list_entry(nodelist, struct cluster_node, list);
|
|
|
3062ca |
- if (node->state == NODESTATE_MEMBER) {
|
|
|
3062ca |
- node->expected_votes = req_exec_quorum_reconfigure->value;
|
|
|
3062ca |
- }
|
|
|
3062ca |
- }
|
|
|
3062ca |
+ update_node_expected_votes(req_exec_quorum_reconfigure->value);
|
|
|
3062ca |
+
|
|
|
3062ca |
votequorum_exec_send_expectedvotes_notification();
|
|
|
3062ca |
update_ev_barrier(req_exec_quorum_reconfigure->value);
|
|
|
3062ca |
if (ev_tracking) {
|
|
|
3062ca |
--
|
|
|
3062ca |
1.7.1
|
|
|
3062ca |
|