sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-03 01:18:10 +03:00
Code

ctdb-recoverd: Add function node_flags() and use it in elections

Browse Source 
Indexing a node map by PNN is suboptimal.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2020-07-29 17:57:53 +10:00 committed by Amitay Isaacs
parent e396eb9fbc
commit 0b5dd07604
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ctdb/server/ctdb_recoverd.c
View File

@ -290,6 +290,23 @@ static bool this_node_can_be_leader(struct ctdb_recoverd *rec)
(rec->ctdb->capabilities & CTDB_CAP_RECMASTER) != 0; (rec->ctdb->capabilities & CTDB_CAP_RECMASTER) != 0;
} }
static bool node_flags(struct ctdb_recoverd *rec, uint32_t pnn, uint32_t *flags)
{
size_t i;
for (i = 0; i < rec->nodemap->num; i++) {
struct ctdb_node_and_flags *node = &rec->nodemap->nodes[i];
if (node->pnn == pnn) {
if (flags != NULL) {
*flags = node->flags;
}
return true;
}
}
return false;
}
/* /*
ban a node for a period of time ban a node for a period of time
*/ */
@ -1398,6 +1415,7 @@ static void ctdb_election_data(struct ctdb_recoverd *rec, struct election_messag
int ret; int ret;
struct ctdb_node_map_old *nodemap; struct ctdb_node_map_old *nodemap;
struct ctdb_context *ctdb = rec->ctdb; struct ctdb_context *ctdb = rec->ctdb;
bool ok;
ZERO_STRUCTP(em); ZERO_STRUCTP(em);
@ -1410,7 +1428,11 @@ static void ctdb_election_data(struct ctdb_recoverd *rec, struct election_messag
return; return;
} }
rec->node_flags = nodemap->nodes[rec->pnn].flags; ok = node_flags(rec, rec->pnn, &rec->node_flags);
if (!ok) {
DBG_ERR("Unable to get node flags for this node\n");
return;
}
em->node_flags = rec->node_flags; em->node_flags = rec->node_flags;
for (i=0;i<nodemap->num;i++) { for (i=0;i<nodemap->num;i++) {