From a0e8304ccf2ef446dc92f701687438449c5a91d9 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Thu, 6 Jun 2024 13:53:43 -0400 Subject: [PATCH] ctdb-server: rename ctdb_load_nodes_file to ctdb_load_nodes Rename ctdb_load_nodes_file to ctdb_load_nodes as it can now load nodes from more than a regular file. Signed-off-by: John Mulligan Reviewed-by: Martin Schwenke --- ctdb/include/ctdb_private.h | 2 +- ctdb/server/ctdb_recover.c | 2 +- ctdb/server/ctdb_recoverd.c | 4 ++-- ctdb/server/ctdb_server.c | 4 ++-- ctdb/server/ctdbd.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index b731724ae0c..88f775ce126 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -840,7 +840,7 @@ struct ctdb_node *ctdb_ip_to_node(struct ctdb_context *ctdb, uint32_t ctdb_ip_to_pnn(struct ctdb_context *ctdb, const ctdb_sock_addr *nodeip); -void ctdb_load_nodes_file(struct ctdb_context *ctdb); +void ctdb_load_nodes(struct ctdb_context *ctdb); int ctdb_set_address(struct ctdb_context *ctdb, const char *address); diff --git a/ctdb/server/ctdb_recover.c b/ctdb/server/ctdb_recover.c index 7b30d119a3a..5a40618487e 100644 --- a/ctdb/server/ctdb_recover.c +++ b/ctdb/server/ctdb_recover.c @@ -158,7 +158,7 @@ ctdb_control_reload_nodes_file(struct ctdb_context *ctdb, uint32_t opcode) ctdb->num_nodes = 0; /* load the new nodes file */ - ctdb_load_nodes_file(ctdb); + ctdb_load_nodes(ctdb); for (i=0; inum_nodes; i++) { /* keep any identical pre-existing nodes and connections */ diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 3f71c07d05d..09d5df3e9cb 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -1624,7 +1624,7 @@ static void reload_nodes_handler(uint64_t srvid, TDB_DATA data, DEBUG(DEBUG_ERR, (__location__ " Reload nodes file from recovery daemon\n")); - ctdb_load_nodes_file(rec->ctdb); + ctdb_load_nodes(rec->ctdb); } @@ -2677,7 +2677,7 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec, if (ctdb->num_nodes != nodemap->num) { DEBUG(DEBUG_ERR, (__location__ " ctdb->num_nodes (%d) != nodemap->num (%d) reloading nodes file\n", ctdb->num_nodes, nodemap->num)); - ctdb_load_nodes_file(ctdb); + ctdb_load_nodes(ctdb); return; } diff --git a/ctdb/server/ctdb_server.c b/ctdb/server/ctdb_server.c index dbb7972e890..0e12e8e834d 100644 --- a/ctdb/server/ctdb_server.c +++ b/ctdb/server/ctdb_server.c @@ -121,8 +121,8 @@ static int convert_node_map_to_list(struct ctdb_context *ctdb, return 0; } -/* Load the nodes list from a file */ -void ctdb_load_nodes_file(struct ctdb_context *ctdb) +/* Load the nodes list from a file or sub-processes' stdout */ +void ctdb_load_nodes(struct ctdb_context *ctdb) { struct ctdb_node_map *node_map; int ret; diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index b8af340d843..73c4372f70d 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -309,7 +309,7 @@ int main(int argc, const char *argv[]) DBG_ERR(" Out of memory\n"); goto fail; } - ctdb_load_nodes_file(ctdb); + ctdb_load_nodes(ctdb); /* * Database setup/options -- 2.47.3