sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00
Code Activity

ctdb-daemon: Replace function ctdb_ip_to_nodeid() with ctdb_ip_to_pnn()

Browse Source 
Node ID is a poorly defined concept, indicating the slot in the node
map where the IP address was found.  This signed value also ends up
compared to num_nodes, which is unsigned, producing unwanted warnings.

Just return the PNN because this what both callers really want.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit 010c1d77cd)
This commit is contained in:
Martin Schwenke
2019-06-22 05:53:15 +10:00
committed by Karolin Seeger
parent b74fde880d
commit a309b862e8
4 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ctdb/include/ctdb_private.h
View File

@ -841,7 +841,8 @@ void ctdb_stop_recoverd(struct ctdb_context *ctdb);
int ctdb_set_transport(struct ctdb_context *ctdb, const char *transport);
int ctdb_ip_to_nodeid(struct ctdb_context *ctdb, const ctdb_sock_addr *nodeip);
uint32_t ctdb_ip_to_pnn(struct ctdb_context *ctdb,
const ctdb_sock_addr *nodeip);
void ctdb_load_nodes_file(struct ctdb_context *ctdb);

11
ctdb/server/ctdb_daemon.c
View File

@ -1251,21 +1251,18 @@ static void ctdb_initialise_vnn_map(struct ctdb_context *ctdb)
static void ctdb_set_my_pnn(struct ctdb_context *ctdb)
{
int nodeid;
if (ctdb->address == NULL) {
ctdb_fatal(ctdb,
"Can not determine PNN - node address is not set\n");
}
nodeid = ctdb_ip_to_nodeid(ctdb, ctdb->address);
if (nodeid == -1) {
ctdb->pnn = ctdb_ip_to_pnn(ctdb, ctdb->address);
if (ctdb->pnn == CTDB_UNKNOWN_PNN) {
ctdb_fatal(ctdb,
"Can not determine PNN - node address not found in node list\n");
"Can not determine PNN - unknown node address\n");
}
ctdb->pnn = ctdb->nodes[nodeid]->pnn;
DEBUG(DEBUG_NOTICE, ("PNN is %u\n", ctdb->pnn));
D_NOTICE("PNN is %u\n", ctdb->pnn);
}
/*

14
ctdb/server/ctdb_server.c
View File

@ -45,24 +45,22 @@ int ctdb_set_transport(struct ctdb_context *ctdb, const char *transport)
return 0;
}
/*
Check whether an ip is a valid node ip
Returns the node id for this ip address or -1
*/
int ctdb_ip_to_nodeid(struct ctdb_context *ctdb, const ctdb_sock_addr *nodeip)
/* Return the PNN for nodeip, CTDB_UNKNOWN_PNN if nodeip is invalid */
uint32_t ctdb_ip_to_pnn(struct ctdb_context *ctdb,
const ctdb_sock_addr *nodeip)
{
int nodeid;
unsigned int nodeid;
for (nodeid=0;nodeid<ctdb->num_nodes;nodeid++) {
if (ctdb->nodes[nodeid]->flags & NODE_FLAGS_DELETED) {
continue;
}
if (ctdb_same_ip(&ctdb->nodes[nodeid]->address, nodeip)) {
return nodeid;
return ctdb->nodes[nodeid]->pnn;
}
}
return -1;
return CTDB_UNKNOWN_PNN;
}
/* Load a nodes list file into a nodes array */

10
ctdb/tcp/tcp_connect.c
View File

@ -244,7 +244,8 @@ static void ctdb_listen_event(struct tevent_context *ev, struct tevent_fd *fde,
struct ctdb_tcp *ctcp = talloc_get_type(ctdb->private_data, struct ctdb_tcp);
ctdb_sock_addr addr;
socklen_t len;
int fd, nodeid;
int fd;
uint32_t pnn;
struct ctdb_incoming *in;
int one = 1;
int ret;
@ -255,10 +256,11 @@ static void ctdb_listen_event(struct tevent_context *ev, struct tevent_fd *fde,
if (fd == -1) return;
smb_set_close_on_exec(fd);
nodeid = ctdb_ip_to_nodeid(ctdb, &addr);
pnn = ctdb_ip_to_pnn(ctdb, &addr);
if (nodeid == -1) {
DEBUG(DEBUG_ERR, ("Refused connection from unknown node %s\n", ctdb_addr_to_str(&addr)));
if (pnn == CTDB_UNKNOWN_PNN) {
D_ERR("Refused connection from unknown node %s\n",
ctdb_addr_to_str(&addr));
close(fd);
return;
}