proxmox-mirrors/mirror_corosync
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_corosync synced 2025-07-27 09:22:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Return an exit code of 1 if an interface is faulty in corosync-cfgtool

Browse Source 
Signed-off-by: Oren Nechustan <theoren28@hotmail.com>
Signed-off-by: Steven Dake <sdake@redhat.com>
Reviewed-by: Fabio Di Nitto <fdinitto@redhat.com>
This commit is contained in:
Steven Dake 2012-01-25 08:43:56 -07:00
parent 2b66a7aa51
commit ba480ce908
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
man/corosync-cfgtool.8
View File

@ -35,7 +35,7 @@
.SH "NAME"
corosync-cfgtool \- An administrative tool for corosync.
.SH "SYNOPSIS"
.B corosync\-cfgtool [\-s] [\-r] [\-l] [\-u] [\-H] [service_name] [\-v] [version] [\-k] [nodeid] [\-a] [nodeid]
.B corosync\-cfgtool [\-i] [IP_address] [\-s] [\-r] [\-l] [\-u] [\-H] [service_name] [\-v] [version] [\-k] [nodeid] [\-a] [nodeid]
.SH "DESCRIPTION"
.B corosync\-cfgtool
A tool for displaying and configuring active parameters within corosync.
@ -43,9 +43,14 @@ A tool for displaying and configuring active parameters within corosync.
.TP
.B -h
Print basic usage.
.TP
.B -i
Finds only information about the specified interface IP address.
.TP
.B -s
Displays the status of the current rings on this node.
Displays the status of the current rings on this node. If any interfaces are
faulty, 1 is returned by the binary. If all interfaces are active 0 is returned
to the shell.
.TP
.B -r
Reset redundant ring state cluster wide after a fault to

32
tools/corosync-cfgtool.c
View File

@ -51,7 +51,7 @@
#include <corosync/totem/totem.h>
#include <corosync/cfg.h>
static void ringstatusget_do (void)
static int ringstatusget_do (char *interface_name)
{
cs_error_t result;
corosync_cfg_handle_t handle;
@ -60,6 +60,7 @@ static void ringstatusget_do (void)
char **interface_status;
unsigned int i;
unsigned int nodeid;
int rc = 0;
printf ("Printing ring status.\n");
result = corosync_cfg_initialize (&handle, NULL);
@ -84,12 +85,22 @@ static void ringstatusget_do (void)
printf ("Could not get the ring status, the error is: %d\n", result);
} else {
for (i = 0; i < interface_count; i++) {
printf ("RING ID %d\n", i);
printf ("\tid\t= %s\n", interface_names[i]);
printf ("\tstatus\t= %s\n", interface_status[i]);
if ( (interface_name &&
(interface_name[0]=='\0' ||
strcasecmp (interface_name, interface_names[i]) == 0)) ||
!interface_name ) {
printf ("RING ID %d\n", i);
printf ("\tid\t= %s\n", interface_names[i]);
printf ("\tstatus\t= %s\n", interface_status[i]);
if (strstr(interface_status[i], "FAULTY")) {
rc = 1;
}
}
}
}
(void)corosync_cfg_finalize (handle);
return rc;
}
static void ringreenable_do (void)
@ -254,7 +265,7 @@ static void killnode_do(unsigned int nodeid)
static void usage_do (void)
{
printf ("corosync-cfgtool [-s] [-r] [-l] [-u] [-H] [service_name] [-v] [version] [-k] [nodeid] [-a] [nodeid]\n\n");
printf ("corosync-cfgtool [[-i <interface ip>] -s] [-r] [-l] [-u] [-H] [service_name] [-v] [version] [-k] [nodeid] [-a] [nodeid]\n\n");
printf ("A tool for displaying and configuring active parameters within corosync.\n");
printf ("options:\n");
printf ("\t-s\tDisplays the status of the current rings on this node.\n");
@ -280,21 +291,26 @@ xstrdup (char const *s)
}
int main (int argc, char *argv[]) {
const char *options = "srl:u:v:k:a:c:hH";
const char *options = "i:srl:u:v:k:a:c:hH";
int opt;
int service_load = 0;
unsigned int nodeid;
int service_unload = 0;
char *service = NULL;
unsigned int version = 0;
char interface_name[128] = "";
int rc=0;
if (argc == 1) {
usage_do ();
}
while ( (opt = getopt(argc, argv, options)) != -1 ) {
switch (opt) {
case 'i':
strncpy(interface_name, optarg, sizeof(interface_name));
break;
case 's':
ringstatusget_do ();
rc = ringstatusget_do (interface_name);
break;
case 'r':
ringreenable_do ();
@ -336,5 +352,5 @@ int main (int argc, char *argv[]) {
service_unload_do (service, version);
}
return (0);
return (rc);
}