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-server: rename nodes_file field to nodes_source

Browse Source 
Rename the `struct ctdb_context` field nodes_file to nodes_source to
better match that the field may indicate something other than a true
file.

Signed-off-by: John Mulligan <jmulligan@redhat.com>
Reviewed-by: Martin Schwenke <martin@meltin.net>
This commit is contained in:
John Mulligan 2024-06-06 13:50:02 -04:00 committed by Martin Schwenke
parent dc65e7082d
commit 7e7cb91806
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/include/ctdb_private.h
View File

@ -328,7 +328,7 @@ struct ctdb_context {
struct ctdb_reloadips_handle *reload_ips;
const char *nodes_file;
const char *nodes_source;
const char *public_addresses_file;
struct trbt_tree *child_processes;

2
ctdb/server/ctdb_daemon.c
View File

@ -2193,7 +2193,7 @@ int ctdb_control_getnodesfile(struct ctdb_context *ctdb,
CHECK_CONTROL_DATA_SIZE(0);
node_map = ctdb_read_nodes(ctdb, ctdb->nodes_file);
node_map = ctdb_read_nodes(ctdb, ctdb->nodes_source);
if (node_map == NULL) {
D_ERR("Failed to read nodes file\n");
return -1;

6
ctdb/server/ctdb_server.c
View File

@ -127,7 +127,7 @@ void ctdb_load_nodes_file(struct ctdb_context *ctdb)
struct ctdb_node_map *node_map;
int ret;
node_map = ctdb_read_nodes(ctdb, ctdb->nodes_file);
node_map = ctdb_read_nodes(ctdb, ctdb->nodes_source);
if (node_map == NULL) {
goto fail;
}
@ -143,8 +143,8 @@ void ctdb_load_nodes_file(struct ctdb_context *ctdb)
return;
fail:
DEBUG(DEBUG_ERR, ("Failed to load nodes file \"%s\"\n",
ctdb->nodes_file));
DEBUG(DEBUG_ERR, ("Failed to load nodes \"%s\"\n",
ctdb->nodes_source));
talloc_free(node_map);
exit(1);
}

4
ctdb/server/ctdbd.c
View File

@ -304,8 +304,8 @@ int main(int argc, const char *argv[])
}
/* tell ctdb what nodes are available */
ctdb->nodes_file = cluster_conf_nodes_list(ctdb, conf);
if (ctdb->nodes_file == NULL) {
ctdb->nodes_source = cluster_conf_nodes_list(ctdb, conf);
if (ctdb->nodes_source == NULL) {
DBG_ERR(" Out of memory\n");
goto fail;
}