cluster-commits July 2011

cluster-commits@lists.stg.fedorahosted.org

8 participants
57 discussions

fence-agents: master - fence_kdump: change default timeout back to 60
by rohara 29 Jul '11

29 Jul '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: cb379c612524d6494c94153525699deb9712d028 Parent: 66d88fb0c34a66e62c7a7ac945856290372c7b45 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Fri Jul 29 11:42:09 2011 -0500 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Fri Jul 29 11:42:09 2011 -0500 fence_kdump: change default timeout back to 60 After more testing, the time between when the fence_kdump agent begins listening for a message and the time that it receives a message appears to be approximately 43-45 seconds. The default timeout of 60 seconds should be sufficient. Users that wish to wait more than 60 seconds can increase the timeout via the "timeout=<time>" option. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> --- fence/agents/kdump/options.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fence/agents/kdump/options.h b/fence/agents/kdump/options.h index ba82f9c..10fa2a2 100644 --- a/fence/agents/kdump/options.h +++ b/fence/agents/kdump/options.h @@ -49,7 +49,7 @@ enum { #define FENCE_KDUMP_DEFAULT_ACTION 0 #define FENCE_KDUMP_DEFAULT_COUNT 0 #define FENCE_KDUMP_DEFAULT_INTERVAL 10 -#define FENCE_KDUMP_DEFAULT_TIMEOUT 120 +#define FENCE_KDUMP_DEFAULT_TIMEOUT 60 #define FENCE_KDUMP_DEFAULT_VERBOSE 0 typedef struct fence_kdump_opts {

1 0

fence-agents: master - fence_kdump: Fix logging
by rohara 29 Jul '11

29 Jul '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 66d88fb0c34a66e62c7a7ac945856290372c7b45 Parent: 70835e37a5389603284cb8f7c173c895507539d6 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Fri Jul 29 11:39:47 2011 -0500 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Fri Jul 29 11:39:47 2011 -0500 fence_kdump: Fix logging Change the log_debug and log_error macros. For fence_kdump, also write to syslog. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> --- fence/agents/kdump/fence_kdump.c | 74 ++++++++++++++++++-------------- fence/agents/kdump/fence_kdump_send.c | 44 ++++++++++--------- 2 files changed, 65 insertions(+), 53 deletions(-) diff --git a/fence/agents/kdump/fence_kdump.c b/fence/agents/kdump/fence_kdump.c index adfffa4..8fdb681 100644 --- a/fence/agents/kdump/fence_kdump.c +++ b/fence/agents/kdump/fence_kdump.c @@ -39,16 +39,20 @@ static int verbose = 0; -#define log_debug(lvl, fmt, args...) \ -do { \ - if (lvl <= verbose) \ - fprintf (stdout, fmt, ##args); \ +#define log_debug(lvl, fmt, args...) \ +do { \ + if (lvl <= verbose) { \ + fprintf (stdout, "[debug]: " fmt, ##args); \ + syslog (LOG_INFO, fmt, ##args); \ + } \ } while (0); -#define log_error(lvl, fmt, args...) \ -do { \ - if (lvl <= verbose) \ - fprintf (stderr, fmt, ##args); \ +#define log_error(lvl, fmt, args...) \ +do { \ + if (lvl <= verbose) { \ + fprintf (stderr, "[error]: " fmt, ##args); \ + syslog (LOG_ERR, fmt, ##args); \ + } \ } while (0); static int @@ -87,7 +91,7 @@ read_message (const fence_kdump_node_t *node, void *msg, int len) error = recvfrom (node->socket, msg, len, 0, (struct sockaddr *) &ss, &size); if (error < 0) { - log_error (1, "[error]: recvfrom (%s)\n", strerror (errno)); + log_error (2, "recvfrom (%s)\n", strerror (errno)); goto out; } @@ -96,13 +100,13 @@ read_message (const fence_kdump_node_t *node, void *msg, int len) port, sizeof (port), NI_NUMERICHOST | NI_NUMERICSERV); if (error != 0) { - log_error (1, "[error]: getnameinfo (%s)\n", gai_strerror (error)); + log_error (2, "getnameinfo (%s)\n", gai_strerror (error)); goto out; } error = strcasecmp (node->addr, addr); if (error != 0) { - log_debug (1, "[debug]: discard message from '%s'\n", addr); + log_debug (1, "discard message from '%s'\n", addr); } out: @@ -130,16 +134,16 @@ do_action_off (const fence_kdump_opts_t *opts) FD_ZERO (&rfds); FD_SET (node->socket, &rfds); - log_debug (1, "[debug]: waiting for message from %s\n", node->addr); + log_debug (0, "waiting for message from '%s'\n", node->addr); for (;;) { error = select (node->socket + 1, &rfds, NULL, NULL, &timeout); if (error < 0) { - log_error (1, "[error]: select (%s)\n", strerror (errno)); + log_error (2, "select (%s)\n", strerror (errno)); break; } if (error == 0) { - log_debug (1, "[debug]: timeout after %d seconds\n", opts->timeout); + log_debug (0, "timeout after %d seconds\n", opts->timeout); break; } @@ -148,15 +152,16 @@ do_action_off (const fence_kdump_opts_t *opts) } if (msg.magic != FENCE_KDUMP_MAGIC) { - log_debug (1, "[debug]: invalid magic number '0x%X'\n", msg.magic); + log_debug (1, "invalid magic number '0x%X'\n", msg.magic); continue; } switch (msg.version) { case FENCE_KDUMP_MSGV1: + log_debug (0, "received valid message from '%s'\n", node->addr); return (0); default: - log_debug (1, "[debug]: invalid message version '0x%X'\n", msg.version); + log_debug (1, "invalid message version '0x%X'\n", msg.version); continue; } } @@ -272,7 +277,7 @@ print_usage (const char *self) return; } -static void +static int get_options_node (fence_kdump_opts_t *opts) { int error; @@ -281,8 +286,8 @@ get_options_node (fence_kdump_opts_t *opts) node = malloc (sizeof (fence_kdump_node_t)); if (!node) { - log_error (1, "[error]: malloc (%s)\n", strerror (errno)); - return; + log_error (2, "malloc (%s)\n", strerror (errno)); + return (1); } memset (node, 0, sizeof (fence_kdump_node_t)); @@ -299,9 +304,9 @@ get_options_node (fence_kdump_opts_t *opts) node->info = NULL; error = getaddrinfo (node->name, node->port, &hints, &node->info); if (error != 0) { - log_error (1, "[error]: getaddrinfo (%s)\n", gai_strerror (error)); + log_error (2, "getaddrinfo (%s)\n", gai_strerror (error)); free_node (node); - return; + return (1); } error = getnameinfo (node->info->ai_addr, node->info->ai_addrlen, @@ -309,9 +314,9 @@ get_options_node (fence_kdump_opts_t *opts) node->port, sizeof (node->port), NI_NUMERICHOST | NI_NUMERICSERV); if (error != 0) { - log_error (1, "[error]: getnameinfo (%s)\n", gai_strerror (error)); + log_error (2, "getnameinfo (%s)\n", gai_strerror (error)); free_node (node); - return; + return (1); } hints.ai_family = node->info->ai_family; @@ -322,30 +327,30 @@ get_options_node (fence_kdump_opts_t *opts) node->info = NULL; error = getaddrinfo (NULL, node->port, &hints, &node->info); if (error != 0) { - log_error (1, "[error]: getaddrinfo (%s)\n", gai_strerror (error)); + log_error (2, "getaddrinfo (%s)\n", gai_strerror (error)); free_node (node); - return; + return (1); } node->socket = socket (node->info->ai_family, node->info->ai_socktype, node->info->ai_protocol); if (node->socket < 0) { - log_error (1, "[error]: socket (%s)\n", strerror (errno)); + log_error (2, "socket (%s)\n", strerror (errno)); free_node (node); - return; + return (1); } error = bind (node->socket, node->info->ai_addr, node->info->ai_addrlen); if (error != 0) { - log_error (1, "[error]: bind (%s)\n", strerror (errno)); + log_error (2, "bind (%s)\n", strerror (errno)); free_node (node); - return; + return (1); } list_add_tail (&node->list, &opts->nodes); - return; + return (0); } static void @@ -469,12 +474,17 @@ main (int argc, char **argv) get_options_stdin (&opts); } + openlog ("fence_kdump", LOG_CONS|LOG_PID, LOG_DAEMON); + if (opts.action == FENCE_KDUMP_ACTION_OFF) { if (opts.nodename == NULL) { - log_error (0, "[error]: action 'off' requires nodename\n"); + log_error (0, "action 'off' requires nodename\n"); + exit (1); + } + if (get_options_node (&opts) != 0) { + log_error (0, "failed to get node '%s'\n", opts.nodename); exit (1); } - get_options_node (&opts); } if (verbose != 0) { diff --git a/fence/agents/kdump/fence_kdump_send.c b/fence/agents/kdump/fence_kdump_send.c index 7a48bd6..fab3d36 100644 --- a/fence/agents/kdump/fence_kdump_send.c +++ b/fence/agents/kdump/fence_kdump_send.c @@ -39,16 +39,16 @@ static int verbose = 0; -#define log_debug(lvl, fmt, args...) \ -do { \ - if (lvl <= verbose) \ - fprintf (stdout, fmt, ##args); \ +#define log_debug(lvl, fmt, args...) \ +do { \ + if (lvl <= verbose) \ + fprintf (stdout, "[debug]: " fmt, ##args); \ } while (0); -#define log_error(lvl, fmt, args...) \ -do { \ - if (lvl <= verbose) \ - fprintf (stderr, fmt, ##args); \ +#define log_error(lvl, fmt, args...) \ +do { \ + if (lvl <= verbose) \ + fprintf (stderr, "[error]: " fmt, ##args); \ } while (0); static int @@ -58,11 +58,11 @@ send_message (const fence_kdump_node_t *node, void *msg, int len) error = sendto (node->socket, msg, len, 0, node->info->ai_addr, node->info->ai_addrlen); if (error < 0) { - log_error (1, "[error]: sendto (%s)\n", strerror (errno)); + log_error (2, "sendto (%s)\n", strerror (errno)); goto out; } - log_debug (1, "[debug]: message sent to node '%s'\n", node->addr); + log_debug (1, "message sent to node '%s'\n", node->addr); out: return (error); @@ -94,7 +94,7 @@ print_usage (const char *self) return; } -static void +static int get_options_node (fence_kdump_opts_t *opts) { int error; @@ -103,8 +103,8 @@ get_options_node (fence_kdump_opts_t *opts) node = malloc (sizeof (fence_kdump_node_t)); if (!node) { - log_error (1, "[error]: malloc (%s)\n", strerror (errno)); - return; + log_error (2, "malloc (%s)\n", strerror (errno)); + return (1); } memset (node, 0, sizeof (fence_kdump_node_t)); @@ -121,9 +121,9 @@ get_options_node (fence_kdump_opts_t *opts) node->info = NULL; error = getaddrinfo (node->name, node->port, &hints, &node->info); if (error != 0) { - log_error (1, "[error]: getaddrinfo (%s)\n", gai_strerror (error)); + log_error (2, "getaddrinfo (%s)\n", gai_strerror (error)); free_node (node); - return; + return (1); } error = getnameinfo (node->info->ai_addr, node->info->ai_addrlen, @@ -131,23 +131,23 @@ get_options_node (fence_kdump_opts_t *opts) node->port, sizeof (node->port), NI_NUMERICHOST | NI_NUMERICSERV); if (error != 0) { - log_error (1, "[error]: getnameinfo (%s)\n", gai_strerror (error)); + log_error (2, "getnameinfo (%s)\n", gai_strerror (error)); free_node (node); - return; + return (1); } node->socket = socket (node->info->ai_family, node->info->ai_socktype, node->info->ai_protocol); if (node->socket < 0) { - log_error (1, "[error]: socket (%s)\n", strerror (errno)); + log_error (2, "socket (%s)\n", strerror (errno)); free_node (node); - return; + return (1); } list_add_tail (&node->list, &opts->nodes); - return; + return (0); } static void @@ -219,7 +219,9 @@ main (int argc, char **argv) for (; optind < argc; optind++) { opts.nodename = argv[optind]; - get_options_node (&opts); + if (get_options_node (&opts) != 0) { + log_error (1, "failed to get node '%s'\n", opts.nodename); + } opts.nodename = NULL; }

1 0

fence-agents: master - fence_kdump: remove binary files from git
by rohara 28 Jul '11

28 Jul '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 70835e37a5389603284cb8f7c173c895507539d6 Parent: c7088127776aff5a763222937cadb4fae4f66cc4 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Thu Jul 28 20:38:02 2011 -0500 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Thu Jul 28 20:38:02 2011 -0500 fence_kdump: remove binary files from git --- fence/agents/kdump/fence_kdump | Bin 114156 -> 0 bytes fence/agents/kdump/fence_kdump_send | Bin 103918 -> 0 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/fence/agents/kdump/fence_kdump b/fence/agents/kdump/fence_kdump deleted file mode 100755 index 0143aaa..0000000 Binary files a/fence/agents/kdump/fence_kdump and /dev/null differ diff --git a/fence/agents/kdump/fence_kdump_send b/fence/agents/kdump/fence_kdump_send deleted file mode 100755 index ed72130..0000000 Binary files a/fence/agents/kdump/fence_kdump_send and /dev/null differ

1 0

fence-agents: master - fence_kdump: Increase default timeout to 120
by rohara 28 Jul '11

28 Jul '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: c7088127776aff5a763222937cadb4fae4f66cc4 Parent: 6a66ef7fedeef8e0538ea600d9304a5112da9220 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Thu Jul 28 14:06:14 2011 -0500 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Thu Jul 28 14:06:14 2011 -0500 fence_kdump: Increase default timeout to 120 The default timeout value of 60 seconds appears to be to short, so we should increase the default timeout value to 120 seconds. This is the time that the fence_kdump agent will wait for a message before returning failure. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> --- fence/agents/kdump/fence_kdump | Bin 0 -> 114156 bytes fence/agents/kdump/fence_kdump_send | Bin 0 -> 103918 bytes fence/agents/kdump/options.h | 2 +- 3 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fence/agents/kdump/fence_kdump b/fence/agents/kdump/fence_kdump new file mode 100755 index 0000000..0143aaa Binary files /dev/null and b/fence/agents/kdump/fence_kdump differ diff --git a/fence/agents/kdump/fence_kdump_send b/fence/agents/kdump/fence_kdump_send new file mode 100755 index 0000000..ed72130 Binary files /dev/null and b/fence/agents/kdump/fence_kdump_send differ diff --git a/fence/agents/kdump/options.h b/fence/agents/kdump/options.h index 10fa2a2..ba82f9c 100644 --- a/fence/agents/kdump/options.h +++ b/fence/agents/kdump/options.h @@ -49,7 +49,7 @@ enum { #define FENCE_KDUMP_DEFAULT_ACTION 0 #define FENCE_KDUMP_DEFAULT_COUNT 0 #define FENCE_KDUMP_DEFAULT_INTERVAL 10 -#define FENCE_KDUMP_DEFAULT_TIMEOUT 60 +#define FENCE_KDUMP_DEFAULT_TIMEOUT 120 #define FENCE_KDUMP_DEFAULT_VERBOSE 0 typedef struct fence_kdump_opts {

1 0

fence-agents: master - fence_kdump: remove FENCE_KDUMP_MSGV2
by rohara 26 Jul '11

26 Jul '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 6a66ef7fedeef8e0538ea600d9304a5112da9220 Parent: 6dd3851c335f98cfa06f160019943ce243dca061 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Tue Jul 26 14:19:35 2011 -0500 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Tue Jul 26 14:19:35 2011 -0500 fence_kdump: remove FENCE_KDUMP_MSGV2 FENCE_KDUMP_MSGV2 is not used at this time, so remove it. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> --- fence/agents/kdump/message.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/fence/agents/kdump/message.h b/fence/agents/kdump/message.h index 3d1d2b4..2c82229 100644 --- a/fence/agents/kdump/message.h +++ b/fence/agents/kdump/message.h @@ -25,7 +25,6 @@ #define FENCE_KDUMP_MAGIC 0x1B302A40 #define FENCE_KDUMP_MSGV1 0x1 -#define FENCE_KDUMP_MSGV2 0x2 typedef struct __attribute__ ((packed)) fence_kdump_msg { uint32_t magic;

1 0

fence-agents: master - fence_kdump: include ctype.h
by rohara 26 Jul '11

26 Jul '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 6dd3851c335f98cfa06f160019943ce243dca061 Parent: 225d3404357bfe33a07c2200a0d80af10fcbb03d Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Tue Jul 26 14:07:52 2011 -0500 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Tue Jul 26 14:07:52 2011 -0500 fence_kdump: include ctype.h Add ctype.h to avoid implicit declaration of isspace function. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> --- fence/agents/kdump/fence_kdump.c | 1 + fence/agents/kdump/fence_kdump_send.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/fence/agents/kdump/fence_kdump.c b/fence/agents/kdump/fence_kdump.c index 7df9f90..adfffa4 100644 --- a/fence/agents/kdump/fence_kdump.c +++ b/fence/agents/kdump/fence_kdump.c @@ -27,6 +27,7 @@ #include <getopt.h> #include <unistd.h> #include <syslog.h> +#include <ctype.h> #include <errno.h> #include <netdb.h> #include <sys/types.h> diff --git a/fence/agents/kdump/fence_kdump_send.c b/fence/agents/kdump/fence_kdump_send.c index 29018a4..7a48bd6 100644 --- a/fence/agents/kdump/fence_kdump_send.c +++ b/fence/agents/kdump/fence_kdump_send.c @@ -27,6 +27,7 @@ #include <getopt.h> #include <unistd.h> #include <syslog.h> +#include <ctype.h> #include <errno.h> #include <netdb.h> #include <sys/types.h>

1 0

fence-agents: master - fence_kdump: fix compiler warnings
by rohara 26 Jul '11

26 Jul '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 225d3404357bfe33a07c2200a0d80af10fcbb03d Parent: 1e2ad19acc6921b11fd3e175bec9c92c857f4289 Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Tue Jul 26 13:56:29 2011 -0500 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Tue Jul 26 13:56:29 2011 -0500 fence_kdump: fix compiler warnings Change 'inline void' function to 'static inline void' to avoid compiler warnings. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> --- fence/agents/kdump/message.h | 2 +- fence/agents/kdump/options.h | 28 ++++++++++++++-------------- fence/agents/kdump/version.h | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/fence/agents/kdump/message.h b/fence/agents/kdump/message.h index 11e6d0f..3d1d2b4 100644 --- a/fence/agents/kdump/message.h +++ b/fence/agents/kdump/message.h @@ -32,7 +32,7 @@ typedef struct __attribute__ ((packed)) fence_kdump_msg { uint32_t version; } fence_kdump_msg_t; -inline void +static inline void init_message (fence_kdump_msg_t *msg) { msg->magic = FENCE_KDUMP_MAGIC; diff --git a/fence/agents/kdump/options.h b/fence/agents/kdump/options.h index 6c7d274..10fa2a2 100644 --- a/fence/agents/kdump/options.h +++ b/fence/agents/kdump/options.h @@ -73,20 +73,20 @@ typedef struct fence_kdump_node { struct list_head list; } fence_kdump_node_t; -inline void +static inline void init_node (fence_kdump_node_t *node) { node->info = NULL; } -inline void +static inline void free_node (fence_kdump_node_t *node) { freeaddrinfo (node->info); free (node); } -inline void +static inline void print_node (const fence_kdump_node_t *node) { fprintf (stdout, "[debug]: node { \n"); @@ -97,7 +97,7 @@ print_node (const fence_kdump_node_t *node) fprintf (stdout, "[debug]: } \n"); } -inline void +static inline void init_options (fence_kdump_opts_t *opts) { opts->nodename = NULL; @@ -112,7 +112,7 @@ init_options (fence_kdump_opts_t *opts) INIT_LIST_HEAD (&opts->nodes); } -inline void +static inline void free_options (fence_kdump_opts_t *opts) { fence_kdump_node_t *node; @@ -126,7 +126,7 @@ free_options (fence_kdump_opts_t *opts) free (opts->nodename); } -inline void +static inline void print_options (fence_kdump_opts_t *opts) { fence_kdump_node_t *node; @@ -146,7 +146,7 @@ print_options (fence_kdump_opts_t *opts) } } -inline void +static inline void set_option_nodename (fence_kdump_opts_t *opts, const char *arg) { if (opts->nodename != NULL) { @@ -156,7 +156,7 @@ set_option_nodename (fence_kdump_opts_t *opts, const char *arg) opts->nodename = strdup (arg); } -inline void +static inline void set_option_ipport (fence_kdump_opts_t *opts, const char *arg) { opts->ipport = atoi (arg); @@ -167,7 +167,7 @@ set_option_ipport (fence_kdump_opts_t *opts, const char *arg) } } -inline void +static inline void set_option_family (fence_kdump_opts_t *opts, const char *arg) { if (!strcasecmp (arg, "auto")) { @@ -182,7 +182,7 @@ set_option_family (fence_kdump_opts_t *opts, const char *arg) } } -inline void +static inline void set_option_action (fence_kdump_opts_t *opts, const char *arg) { if (!strcasecmp (arg, "off")) { @@ -195,7 +195,7 @@ set_option_action (fence_kdump_opts_t *opts, const char *arg) } } -inline void +static inline void set_option_count (fence_kdump_opts_t *opts, const char *arg) { opts->count = atoi (arg); @@ -206,7 +206,7 @@ set_option_count (fence_kdump_opts_t *opts, const char *arg) } } -inline void +static inline void set_option_interval (fence_kdump_opts_t *opts, const char *arg) { opts->interval = atoi (arg); @@ -217,7 +217,7 @@ set_option_interval (fence_kdump_opts_t *opts, const char *arg) } } -inline void +static inline void set_option_timeout (fence_kdump_opts_t *opts, const char *arg) { opts->timeout = atoi (arg); @@ -228,7 +228,7 @@ set_option_timeout (fence_kdump_opts_t *opts, const char *arg) } } -inline void +static inline void set_option_verbose (fence_kdump_opts_t *opts, const char *arg) { if (arg != NULL) { diff --git a/fence/agents/kdump/version.h b/fence/agents/kdump/version.h index e7959c4..ed178b1 100644 --- a/fence/agents/kdump/version.h +++ b/fence/agents/kdump/version.h @@ -24,7 +24,7 @@ #define FENCE_KDUMP_VERSION "0.1" -inline void +static inline void print_version (const char *self) { fprintf (stdout, "%s %s\n", basename (self), FENCE_KDUMP_VERSION);

1 0

fence-agents: master - build: add extra check required for fence_kdump
by Fabio M. Di Nitto 26 Jul '11

26 Jul '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: 1e2ad19acc6921b11fd3e175bec9c92c857f4289 Parent: dac33a063ccb16e2e3b5a5e6a59b947e812bc03c Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue Jul 26 20:14:33 2011 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Jul 26 20:14:33 2011 +0200 build: add extra check required for fence_kdump Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- configure.ac | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 558ee44..e979675 100644 --- a/configure.ac +++ b/configure.ac @@ -89,11 +89,13 @@ PKG_CHECK_MODULES([nss],[nss]) PKG_CHECK_MODULES([nspr],[nspr]) # Checks for header files. -AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h stddef.h sys/socket.h sys/time.h syslog.h]) +AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h netdb.h stddef.h sys/socket.h sys/time.h syslog.h]) # Checks for typedefs, structures, and compiler characteristics. +AC_C_INLINE AC_TYPE_SIZE_T AC_TYPE_SSIZE_T +AC_TYPE_UINT32_T # Checks for library functions. AC_FUNC_FORK

1 0

gfs2-utils: master - i18n: strings review
by cmaiolino 26 Jul '11

26 Jul '11

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitdif… Commit: f3a03a185ad197cb7ce488d15241174c215efcb8 Parent: 4adcdab609503628601f0c420327bc909a779a85 Author: Carlos Maiolino <cmaiolino(a)redhat.com> AuthorDate: Tue Jul 26 10:32:49 2011 -0300 Committer: Carlos Maiolino <cmaiolino(a)redhat.com> CommitterDate: Tue Jul 26 11:10:51 2011 -0300 i18n: strings review This patch is the first review of the gfs2-utils strings that will be translated. The changes in this patch were based according with the current strings added to the .pot file --- gfs2/convert/gfs2_convert.c | 4 ++-- gfs2/fsck/fs_recovery.c | 4 ++-- gfs2/fsck/initialize.c | 10 +++++----- gfs2/fsck/main.c | 8 ++++---- gfs2/fsck/pass1c.c | 2 +- gfs2/fsck/pass4.c | 2 +- gfs2/mkfs/main_grow.c | 4 ++-- gfs2/mkfs/main_jadd.c | 6 +++--- gfs2/mkfs/main_mkfs.c | 6 +++--- gfs2/tune/main.c | 2 +- 10 files changed, 24 insertions(+), 24 deletions(-) diff --git a/gfs2/convert/gfs2_convert.c b/gfs2/convert/gfs2_convert.c index 7f6135f..c255874 100644 --- a/gfs2/convert/gfs2_convert.c +++ b/gfs2/convert/gfs2_convert.c @@ -1690,11 +1690,11 @@ static void process_parameters(int argc, char **argv, struct gfs2_options *opts) strcpy(device, argv[optind]); opts->device = device; if(!opts->device) { - fprintf(stderr, _("Please use '-h' for usage.\n")); + fprintf(stderr, _("No device specified. Please use '-h' for help\n")); exit(1); } } else { - fprintf(stderr, _("No device specified. Use '-h' for usage.\n")); + fprintf(stderr, _("No device specified. Please use '-h' for help\n")); exit(1); } } /* process_parameters */ diff --git a/gfs2/fsck/fs_recovery.c b/gfs2/fsck/fs_recovery.c index da06598..198111b 100644 --- a/gfs2/fsck/fs_recovery.c +++ b/gfs2/fsck/fs_recovery.c @@ -473,8 +473,8 @@ static int gfs2_recover_journal(struct gfs2_inode *ip, int j, int preen, log_info( _("jid=%u: Repairing journal...\n"), j); error = fix_journal_seq_no(ip); if (error) { - log_err( _("jid=%u: Unable to repair the bad " - "journal.\n"), j); + log_err( _("jid=%u: Unable to fix the bad journal.\n"), + j); goto out; } error = gfs2_find_jhead(ip, &head); diff --git a/gfs2/fsck/initialize.c b/gfs2/fsck/initialize.c index 697671c..0930ba6 100644 --- a/gfs2/fsck/initialize.c +++ b/gfs2/fsck/initialize.c @@ -762,7 +762,7 @@ static void peruse_system_dinode(struct gfs2_sbd *sdp, struct gfs2_dinode *di, if (di->di_num.no_formal_ino == 2) { if (sdp->sd_sb.sb_master_dir.no_addr) return; - log_warn(_("Found system master directory at: 0x%llx.\n"), + log_warn(_("Found system master directory at: 0x%llx\n"), di->di_num.no_addr); sdp->sd_sb.sb_master_dir.no_addr = di->di_num.no_addr; return; @@ -887,7 +887,7 @@ static void peruse_user_dinode(struct gfs2_sbd *sdp, struct gfs2_dinode *di, gfs2_lookupi(ip, "..", 2, &parent_ip); if (parent_ip && parent_ip->i_di.di_num.no_addr == ip->i_di.di_num.no_addr) { - log_warn(_("fsck found the root inode at: 0x%llx\n"), + log_warn(_("Found the root directory at: 0x%llx\n"), ip->i_di.di_num.no_addr); sdp->sd_sb.sb_root_dir.no_addr = ip->i_di.di_num.no_addr; @@ -1078,7 +1078,7 @@ static int sb_repair(struct gfs2_sbd *sdp) "be the root; using master - 1.\n")); possible_root = sdp->sd_sb.sb_master_dir.no_addr - 1; } - log_err(_("Found a root directory candidate at 0x%llx\n"), + log_err(_("Found a possible root at: 0x%llx\n"), (unsigned long long)possible_root); sdp->sd_sb.sb_root_dir.no_addr = possible_root; sdp->md.rooti = inode_read(sdp, possible_root); @@ -1106,13 +1106,13 @@ static int sb_repair(struct gfs2_sbd *sdp) /* Step 3 - Rebuild the lock protocol and file system table name */ get_lockproto_table(sdp); if (query(_("Okay to fix the GFS2 superblock? (y/n)"))) { - log_info(_("Master system directory found at: 0x%llx\n"), + log_info(_("Found system master directory at: 0x%llx\n"), sdp->sd_sb.sb_master_dir.no_addr); sdp->master_dir = inode_read(sdp, sdp->sd_sb.sb_master_dir.no_addr); sdp->master_dir->i_di.di_num.no_addr = sdp->sd_sb.sb_master_dir.no_addr; - log_info(_("Root directory found at: 0x%llx\n"), + log_info(_("Found the root directory at: 0x%llx\n"), sdp->sd_sb.sb_root_dir.no_addr); sdp->md.rooti = inode_read(sdp, sdp->sd_sb.sb_root_dir.no_addr); diff --git a/gfs2/fsck/main.c b/gfs2/fsck/main.c index bb540e7..d0aceb1 100644 --- a/gfs2/fsck/main.c +++ b/gfs2/fsck/main.c @@ -99,10 +99,10 @@ static int read_cmdline(int argc, char **argv, struct gfs2_options *gopts) break; case ':': case '?': - fprintf(stderr, _("Please use '-h' for usage.\n")); + fprintf(stderr, _("Please use '-h' for help.\n")); return FSCK_USAGE; default: - fprintf(stderr, _("Unknown option %c\n"), c); + fprintf(stderr, _("Invalid option %c\n"), c); return FSCK_USAGE; } @@ -110,11 +110,11 @@ static int read_cmdline(int argc, char **argv, struct gfs2_options *gopts) if(argc > optind) { gopts->device = (argv[optind]); if(!gopts->device) { - fprintf(stderr, _("Please use '-h' for usage.\n")); + fprintf(stderr, _("Please use '-h' for help.\n")); return FSCK_USAGE; } } else { - fprintf(stderr, _("No device specified. Use '-h' for usage.\n")); + fprintf(stderr, _("No device specified (Please use '-h' for help)\n")); return FSCK_USAGE; } return 0; diff --git a/gfs2/fsck/pass1c.c b/gfs2/fsck/pass1c.c index 0782459..781e8d5 100644 --- a/gfs2/fsck/pass1c.c +++ b/gfs2/fsck/pass1c.c @@ -194,7 +194,7 @@ static int check_eattr_entry(struct gfs2_inode *ip, return ask_remove_eattr_entry(sdp, leaf_bh, ea_hdr, ea_hdr_prev, 0, 0); } else { - log_debug( _(" Pointers Required: %d\n Pointers Reported: %d\n"), + log_debug( _(" Pointers Required: %d\n Pointers Reported: %d\n"), max_ptrs, ea_hdr->ea_num_ptrs); } } diff --git a/gfs2/fsck/pass4.c b/gfs2/fsck/pass4.c index 9233ea7..3305fb3 100644 --- a/gfs2/fsck/pass4.c +++ b/gfs2/fsck/pass4.c @@ -64,7 +64,7 @@ static int scan_inode_list(struct gfs2_sbd *sbp) { (unsigned long long)ii->inode); q = block_type(ii->inode); if(q == gfs2_bad_block) { - log_err( _("Unlinked inode %llu (0x%llx) contains" + log_err( _("Unlinked inode %llu (0x%llx) contains " "bad blocks\n"), (unsigned long long)ii->inode, (unsigned long long)ii->inode); diff --git a/gfs2/mkfs/main_grow.c b/gfs2/mkfs/main_grow.c index 81f492b..0eca396 100644 --- a/gfs2/mkfs/main_grow.c +++ b/gfs2/mkfs/main_grow.c @@ -106,10 +106,10 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd *sdp) case ':': case '?': /* Unknown flag */ - fprintf(stderr, _("Please use '-h' for usage.\n")); + fprintf(stderr, _("Please use '-h' for help.\n")); exit(EXIT_FAILURE); default: - fprintf(stderr, _("Unknown option %c\n"), opt); + fprintf(stderr, _("Invalid option %c\n"), opt); exit(EXIT_FAILURE); break; } diff --git a/gfs2/mkfs/main_jadd.c b/gfs2/mkfs/main_jadd.c index 5f65cce..d722d52 100644 --- a/gfs2/mkfs/main_jadd.c +++ b/gfs2/mkfs/main_jadd.c @@ -129,14 +129,14 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd *sdp) break; case ':': case '?': - fprintf(stderr, _("Please use '-h' for usage.\n")); + fprintf(stderr, _("Please use '-h' for help.\n")); exit(EXIT_FAILURE); break; case EOF: cont = FALSE; break; default: - die( _("Unknown option: %c\n"), optchar); + die( _("Invalid option: %c\n"), optchar); break; }; } @@ -148,7 +148,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd *sdp) die( _("no path specified (try -h for help)\n")); if (optind < argc) - die( _("Unrecognized option: %s\n"), argv[optind]); + die( _("Unrecognized argument: %s\n"), argv[optind]); if (sdp->debug) { printf( _("Command Line Arguments:\n")); diff --git a/gfs2/mkfs/main_mkfs.c b/gfs2/mkfs/main_mkfs.c index eaf2aa2..0da3bc5 100644 --- a/gfs2/mkfs/main_mkfs.c +++ b/gfs2/mkfs/main_mkfs.c @@ -182,7 +182,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd *sdp) case ':': case '?': - fprintf(stderr, _("Please use '-h' for usage.\n")); + fprintf(stderr, _("Please use '-h' for help.\n")); exit(EXIT_FAILURE); break; @@ -203,7 +203,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd *sdp) break; default: - die( _("Unknown option: %c\n"), optchar); + die( _("Invalid option: %c\n"), optchar); break; }; } @@ -212,7 +212,7 @@ static void decode_arguments(int argc, char *argv[], struct gfs2_sbd *sdp) strcpy(sdp->device_name, argv[optind++]); if (sdp->device_name[0] == '\0') - die( _("no device specified (try -h for help)\n")); + die( _("No device specified. Please use '-h' for help\n")); if (optind < argc) sdp->orig_fssize = atol(argv[optind++]); diff --git a/gfs2/tune/main.c b/gfs2/tune/main.c index dc9d6a5..553f6f2 100644 --- a/gfs2/tune/main.c +++ b/gfs2/tune/main.c @@ -89,7 +89,7 @@ int main(int argc, char **argv) version(); return 0; default: - fprintf(stderr, _("Invalid option.\n")); + fprintf(stderr, _("Invalid option: %c\n"), c); usage(argv[0]); return EX_USAGE; }

1 0

fence-agents: master - Updated to include new fence_kdump agent.
by rohara 26 Jul '11

26 Jul '11

Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commi… Commit: dac33a063ccb16e2e3b5a5e6a59b947e812bc03c Parent: cb0da7479aaac6d786b2535d25237aeb2d5dbe4a Author: Ryan O'Hara <rohara(a)redhat.com> AuthorDate: Tue Jul 26 08:52:08 2011 -0500 Committer: Ryan O'Hara <rohara(a)redhat.com> CommitterDate: Tue Jul 26 08:52:08 2011 -0500 Updated to include new fence_kdump agent. Signed-off-by: Ryan O'Hara <rohara(a)redhat.com> --- configure.ac | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index 377019f..558ee44 100644 --- a/configure.ac +++ b/configure.ac @@ -266,6 +266,7 @@ AC_CONFIG_FILES([Makefile fence/agents/ilo_mp/Makefile fence/agents/intelmodular/Makefile fence/agents/ipmilan/Makefile + fence/agents/kdump/Makefile fence/agents/ldom/Makefile fence/agents/lib/Makefile fence/agents/lpar/Makefile

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits July 2011