sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-19 18:50:24 +03:00
Code

ctdb ip is very busy.

Browse Source 
revert the defauls case back to only showing the ip and node
and only display the extra info if -v verbose output is requested

(This used to be ctdb commit 6488651aa7e105c57324f4a300760a010d098fbb)
This commit is contained in:
Ronnie Sahlberg 2010-08-20 11:38:34 +10:00
parent 08a5b0c7c5
commit 1ef66379d7
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
ctdb/tools/ctdb.c
View File

@ -1821,7 +1821,11 @@ static int control_ip(struct ctdb_context *ctdb, int argc, const char **argv)
}
if (options.machinereadable){
printf(":Public IP:Node:ActiveInterface:AvailableInterfaces:ConfiguredInterfaces:\n");
printf(":Public IP:Node:");
if (options.verbose){
printf("ActiveInterface:AvailableInterfaces:ConfiguredInterfaces:");
}
printf("\n");
} else {
if (options.pnn == CTDB_BROADCAST_ALL) {
printf("Public IPs on ALL nodes\n");
@ -1881,19 +1885,29 @@ static int control_ip(struct ctdb_context *ctdb, int argc, const char **argv)
}
if (options.machinereadable){
printf(":%s:%d:%s:%s:%s:\n",
ctdb_addr_to_str(&ips->ips[ips->num-i].addr),
ips->ips[ips->num-i].pnn,
aciface?aciface:"",
avifaces?avifaces:"",
cifaces?cifaces:"");
printf(":%s:%d:",
ctdb_addr_to_str(&ips->ips[ips->num-i].addr),
ips->ips[ips->num-i].pnn);
if (options.verbose){
printf("%s:%s:%s:",
aciface?aciface:"",
avifaces?avifaces:"",
cifaces?cifaces:"");
}
printf("\n");
} else {
printf("%s node[%d] active[%s] available[%s] configured[%s]\n",
ctdb_addr_to_str(&ips->ips[ips->num-i].addr),
ips->ips[ips->num-i].pnn,
aciface?aciface:"",
avifaces?avifaces:"",
cifaces?cifaces:"");
if (options.verbose) {
printf("%s node[%d] active[%s] available[%s] configured[%s]\n",
ctdb_addr_to_str(&ips->ips[ips->num-i].addr),
ips->ips[ips->num-i].pnn,
aciface?aciface:"",
avifaces?avifaces:"",
cifaces?cifaces:"");
} else {
printf("%s %d\n",
ctdb_addr_to_str(&ips->ips[ips->num-i].addr),
ips->ips[ips->num-i].pnn);
}
}
talloc_free(info);
}