sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

ctdb-tools: Reimplement read_nodes_file() using ctdb_get_nodes_file()

Browse Source 
Update the implementation of "ctdb xpnn" and "ctdb listnodes"
accordingly.  Update associated tests too.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2015-02-23 22:05:36 +11:00 committed by Amitay Isaacs
parent 5148228f41
commit c5538a464f
3 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ctdb/tests/tool/stubby.listnodes.001.sh
View File

@ -13,7 +13,7 @@ EOF
rm -f "$CTDB_NODES"
required_result 255 <<EOF
${TEST_DATE_STAMP}Failed to read nodes file
${TEST_DATE_STAMP}Failed to read nodes file "${CTDB_NODES}"
EOF
simple_test <<EOF

2
ctdb/tests/tool/stubby.xpnn.003.sh
View File

@ -13,7 +13,7 @@ EOF
rm -f "$CTDB_NODES"
required_result 255 <<EOF
${TEST_DATE_STAMP}Failed to read nodes file
${TEST_DATE_STAMP}Failed to read nodes file "${CTDB_NODES}"
EOF
simple_test <<EOF

43
ctdb/tools/ctdb.c
View File

@ -900,7 +900,7 @@ static struct pnn_node *read_pnn_node_file(TALLOC_CTX *mem_ctx,
return pnn_nodes;
}
static struct pnn_node *read_nodes_file(TALLOC_CTX *mem_ctx)
static struct ctdb_node_map *read_nodes_file(TALLOC_CTX *mem_ctx)
{
const char *nodes_list;
@ -915,7 +915,7 @@ static struct pnn_node *read_nodes_file(TALLOC_CTX *mem_ctx)
}
}
return read_pnn_node_file(mem_ctx, nodes_list);
return ctdb_read_nodes_file(mem_ctx, nodes_list);
}
/*
@ -926,20 +926,21 @@ static struct pnn_node *read_nodes_file(TALLOC_CTX *mem_ctx)
static int find_node_xpnn(void)
{
TALLOC_CTX *mem_ctx = talloc_new(NULL);
struct pnn_node *pnn_nodes;
struct pnn_node *pnn_node;
int pnn;
struct ctdb_node_map *node_map;
int i, pnn;
pnn_nodes = read_nodes_file(mem_ctx);
if (pnn_nodes == NULL) {
DEBUG(DEBUG_ERR,("Failed to read nodes file\n"));
node_map = read_nodes_file(mem_ctx);
if (node_map == NULL) {
talloc_free(mem_ctx);
return -1;
}
for(pnn_node=pnn_nodes;pnn_node;pnn_node=pnn_node->next) {
if (ctdb_sys_have_ip(&pnn_node->addr)) {
pnn = pnn_node->pnn;
for (i = 0; i < node_map->num; i++) {
if (node_map->nodes[i].flags & NODE_FLAGS_DELETED) {
continue;
}
if (ctdb_sys_have_ip(&node_map->nodes[i].addr)) {
pnn = node_map->nodes[i].pnn;
talloc_free(mem_ctx);
return pnn;
}
@ -6160,22 +6161,26 @@ static int control_msglisten(struct ctdb_context *ctdb, int argc, const char **a
static int control_listnodes(struct ctdb_context *ctdb, int argc, const char **argv)
{
TALLOC_CTX *mem_ctx = talloc_new(NULL);
struct pnn_node *pnn_nodes;
struct pnn_node *pnn_node;
struct ctdb_node_map *node_map;
int i;
assert_single_node_only();
pnn_nodes = read_nodes_file(mem_ctx);
if (pnn_nodes == NULL) {
DEBUG(DEBUG_ERR,("Failed to read nodes file\n"));
node_map = read_nodes_file(mem_ctx);
if (node_map == NULL) {
talloc_free(mem_ctx);
return -1;
}
for(pnn_node=pnn_nodes;pnn_node;pnn_node=pnn_node->next) {
const char *addr = ctdb_addr_to_str(&pnn_node->addr);
for (i = 0; i < node_map->num; i++) {
const char *addr;
if (node_map->nodes[i].flags & NODE_FLAGS_DELETED) {
continue;
}
addr = ctdb_addr_to_str(&node_map->nodes[i].addr);
if (options.machinereadable){
printm(":%d:%s:\n", pnn_node->pnn, addr);
printm(":%d:%s:\n", node_map->nodes[i].pnn, addr);
} else {
printf("%s\n", addr);
}