proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-07-26 23:43:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

votequorum: drop NODESTATE_LEAVING

Browse Source 
this is another leftover from cman compatibility layer

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
Reviewed-by: Christine Caulfield <ccaulfie@redhat.com>
This commit is contained in:
Fabio M. Di Nitto 2012-01-26 11:17:10 +01:00
parent f25d5829f2
commit 40aa40ed84
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
exec/votequorum.c
View File

@ -146,8 +146,7 @@ static int votequorum_exec_send_reconfigure(uint8_t param, unsigned int nodeid,
typedef enum {
NODESTATE_JOINING=1,
NODESTATE_MEMBER,
NODESTATE_DEAD,
NODESTATE_LEAVING
NODESTATE_DEAD
} nodestate_t;
struct cluster_node {
@ -1225,7 +1224,6 @@ static void votequorum_confchg_fn (
const struct memb_ring_id *ring_id)
{
int i;
int leaving = 0;
struct cluster_node *node;
ENTER();
@ -1238,9 +1236,6 @@ static void votequorum_confchg_fn (
for (i = 0; i< left_list_entries; i++) {
node = find_node_by_nodeid(left_list[i]);
if (node) {
if (node->state == NODESTATE_LEAVING) {
leaving = 1;
}
node->state = NODESTATE_DEAD;
node->flags |= NODE_FLAGS_BEENDOWN;
}
@ -1271,7 +1266,7 @@ static void votequorum_confchg_fn (
}
if (left_list_entries) {
recalculate_quorum(leaving, leaving);
recalculate_quorum(0, 0);
}
memcpy(&quorum_ringid, ring_id, sizeof(*ring_id));

1
include/corosync/votequorum.h
View File

@ -58,7 +58,6 @@ typedef uint64_t votequorum_handle_t;
#define NODESTATE_JOINING 1
#define NODESTATE_MEMBER 2
#define NODESTATE_DEAD 3
#define NODESTATE_LEAVING 4
/** @} */

3
test/testvotequorum1.c
View File

@ -57,9 +57,6 @@ static const char *node_state(int state)
case NODESTATE_DEAD:
return "Dead";
break;
case NODESTATE_LEAVING:
return "Leaving";
break;
default:
return "UNKNOWN";
break;