sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

add a num_connected field to the rec structure that holds the number

Browse Source 
of connected nodes

num_active only contains the number of active nodes and would thus not count
banned nodes

(This used to be ctdb commit 06d3ce470766ef0b60d68ccd84de5437146cc147)
This commit is contained in:
Ronnie Sahlberg 2008-03-03 10:24:17 +11:00
parent f6f7f54bd6
commit 57d29f1011
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ctdb/server/ctdb_recoverd.c
View File

@ -44,6 +44,7 @@ struct ctdb_recoverd {
int rec_file_fd;
uint32_t recmaster;
uint32_t num_active;
uint32_t num_connected;
struct ctdb_node_map *nodemap;
uint32_t last_culprit;
uint32_t culprit_counter;
@ -1968,7 +1969,7 @@ static enum monitor_result verify_recmaster(struct ctdb_context *ctdb, struct ct
static void
ctdb_recoverd_write_pnn_connect_count(struct ctdb_recoverd *rec)
{
const char count = rec->num_active;
const char count = rec->num_connected;
struct ctdb_context *ctdb = talloc_get_type(rec->ctdb, struct ctdb_context);
if (pwrite(rec->rec_file_fd, &count, 1, ctdb->pnn) == -1) {
@ -2079,7 +2080,7 @@ static void ctdb_update_pnn_count(struct event_context *ev, struct timed_event *
continue;
}
/* check if that node is more connected that us */
if (count > rec->num_active) {
if (count > rec->num_connected) {
DEBUG(DEBUG_ERR, ("DISCONNECTED Node %u is more connected than we are, yielding recmaster role\n", nodemap->nodes[i].pnn));
close(ctdb->recovery_lock_fd);
ctdb->recovery_lock_fd = -1;
@ -2269,11 +2270,15 @@ again:
rec->node_flags = nodemap->nodes[pnn].flags;
/* count how many active nodes there are */
rec->num_active = 0;
rec->num_active = 0;
rec->num_connected = 0;
for (i=0; i<nodemap->num; i++) {
if (!(nodemap->nodes[i].flags & NODE_FLAGS_INACTIVE)) {
rec->num_active++;
}
if (!(nodemap->nodes[i].flags & NODE_FLAGS_DISCONNECTED)) {
rec->num_connected++;
}
}