cluster: STABLE31 - rgmanager: Add 'disabled' configuration option
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: edc20419a06e9c96cabdf070ba676562ad22ec2c
Parent: 1feac20d86986b7726a42668ac4e31f1d2b89a10
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Wed Jul 27 13:42:55 2011 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Mon Aug 1 16:33:05 2011 -0400
rgmanager: Add 'disabled' configuration option
The option turns off rgmanager, which will shut down if
running and cause rgmanager to refuse to start if
starting up.
Resolves: rhbz#723925
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
rgmanager/src/daemons/main.c | 51 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/rgmanager/src/daemons/main.c b/rgmanager/src/daemons/main.c
index 46ddf18..4e12c68 100644
--- a/rgmanager/src/daemons/main.c
+++ b/rgmanager/src/daemons/main.c
@@ -749,6 +749,14 @@ event_loop(msgctx_t *localctx, msgctx_t *clusterctx)
if (need_reconfigure) {
need_reconfigure = 0;
configure_rgmanager(-1, 0, NULL);
+
+ /*
+ * A shutdown during reconfiguration would slow down
+ * the exit request, so it's pointless to run the
+ * deltas at this point
+ */
+ if (shutdown_pending)
+ return 0;
config_event_q();
return 0;
}
@@ -782,7 +790,6 @@ cleanup(msgctx_t *clusterctx)
}
-
static void
statedump(int __attribute__ ((unused)) sig)
{
@@ -790,6 +797,36 @@ statedump(int __attribute__ ((unused)) sig)
}
+static int
+rgmanager_disabled(int ccsfd)
+{
+ char *v;
+ int disabled = 0;
+ int internal;
+
+ if (ccsfd < 0) {
+ internal = 1;
+ ccsfd = ccs_force_connect(NULL, 0);
+ if (ccsfd < 0)
+ return -1;
+ }
+
+ if (ccs_get(ccsfd, "/cluster/rm/@disabled", &v) == 0) {
+ if (atoi(v) == 1) {
+ disabled = 1;
+ shutdown_pending = 1;
+ logt_print(LOG_NOTICE, "Resource Group Manager Disabled\n");
+ }
+ free(v);
+ }
+
+ if (internal)
+ ccs_disconnect(ccsfd);
+
+ return disabled;
+}
+
+
/*
* Configure logging based on data in cluster.conf
*/
@@ -810,6 +847,8 @@ configure_rgmanager(int ccsfd, int dbg, int *token_secs)
setup_logging(ccsfd);
+ rgmanager_disabled(ccsfd);
+
if (token_secs && ccs_get(ccsfd, "/cluster/totem/@token", &v) == 0) {
tmp = atoi(v);
if (tmp >= 1000) {
@@ -982,6 +1021,13 @@ main(int argc, char **argv)
debug = 1;
}
+ /* If we're disabled in the configuration, don't fork */
+ if (rgmanager_disabled(-1) > 0) {
+ fprintf(stderr,
+ "rgmanager disabled in configuration; not starting\n");
+ return 2;
+ }
+
if (!foreground && (geteuid() == 0)) {
daemon_init(argv[0]);
if (wd && !debug && !watchdog_init())
@@ -1040,6 +1086,9 @@ main(int argc, char **argv)
*/
xmlInitParser();
configure_rgmanager(-1, debug, &cluster_timeout);
+ if (shutdown_pending == 1)
+ goto out_ls;
+
logt_print(LOG_NOTICE, "Resource Group Manager Starting\n");
if (rgm_dbus_notify && rgm_dbus_init() != 0) {
12 years, 9 months
cluster: STABLE31 - rgmanager: Add -F to clusvcadm man page
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 1feac20d86986b7726a42668ac4e31f1d2b89a10
Parent: 6cf33437b750d23eb839f8f1353df837de3a159f
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Fri Jul 29 13:30:38 2011 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Fri Jul 29 13:30:38 2011 -0400
rgmanager: Add -F to clusvcadm man page
Resolves: rhbz#715052
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
rgmanager/man/clusvcadm.8 | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/rgmanager/man/clusvcadm.8 b/rgmanager/man/clusvcadm.8
index d5e09eb..055a0bf 100644
--- a/rgmanager/man/clusvcadm.8
+++ b/rgmanager/man/clusvcadm.8
@@ -8,7 +8,7 @@ clusvcadm \- Cluster User Service Administration Utility
.B ]
.B [\-e
.I <service>
-.B ]
+.B [\-F] ]
.B [\-l]
.B [\-u]
.B [\-S]
@@ -52,10 +52,15 @@ on which the command is invoked.
Stops and disables the user service named
.I
service
-.IP "\-e <service>"
+.IP "\-e <service> [\-F]"
Enables and starts the user service named
.I
service
+
+Normally, rgmanager starts the service locally (i.e. on
+the host where clusvcadm was run). However, if the \fB-F\fP
+option is specified, rgmanager will use the assigned failover
+domain rules as hints on where to start the service.
.IP \-l
Lock services in preparation for cluster shutdown. This should only
be used if the administrator intends to perform a global, cluster
12 years, 9 months
cluster: STABLE31 - rgmanager: Create process group for children
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 6cf33437b750d23eb839f8f1353df837de3a159f
Parent: 28b6e18ebcd5eed8768679dc218af21ee84aed7f
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Mon Apr 18 15:25:21 2011 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Fri Jul 29 13:22:59 2011 -0400
rgmanager: Create process group for children
Resolves: rhbz#684633
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
rgmanager/src/daemons/restree.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c
index 8ce1364..8280c56 100644
--- a/rgmanager/src/daemons/restree.c
+++ b/rgmanager/src/daemons/restree.c
@@ -402,6 +402,7 @@ res_exec(resource_node_t *node, int op, const char *arg, int depth)
res->r_rule->rr_agent);
restore_signals();
+ setpgrp();
if (arg)
execle(fullpath, fullpath, op_str, arg, NULL, env);
12 years, 9 months
gfs2-utils: master - gfs2-utils: Update .gitignore for i18n files
by Andrew Price
Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitd...
Commit: c7c11093e8182f27ad543457028a7ccbd9f00212
Parent: f3a03a185ad197cb7ce488d15241174c215efcb8
Author: Andrew Price <anprice(a)redhat.com>
AuthorDate: Mon Aug 1 16:48:07 2011 +0100
Committer: Andrew Price <anprice(a)redhat.com>
CommitterDate: Mon Aug 1 16:48:07 2011 +0100
gfs2-utils: Update .gitignore for i18n files
Add entries in .gitignore for some i18n-related files which are
generated at build time.
Signed-off-by: Andrew Price <anprice(a)redhat.com>
---
.gitignore | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
index 62e4ac6..e8b7ea1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,3 +37,7 @@ gfs2/tool/gfs2_tool
gfs2/tune/tunegfs2
group/gfs_control/gfs_control
group/gfs_controld/gfs_controld
+ABOUT-NLS
+po/Makevars.template
+po/POTFILES
+po/stamp-po
12 years, 9 months
fence-agents: RHEL6 - fence_kdump: change default timeout back to 60
by rohara
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: 15860efcf92300d52fda31386efa1e5b0efdbc98
Parent: 0cbcb84795f63a5094d1119cadb47a942158c11d
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: Mon Aug 1 05:39:33 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.
Resolves: rhbz#461948
Signed-off-by: Ryan O'Hara <rohara(a)redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto(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 {
12 years, 9 months
fence-agents: RHEL6 - fence_kdump: Fix logging
by rohara
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: 0cbcb84795f63a5094d1119cadb47a942158c11d
Parent: de6f04cc3900857111f14c25a548e745322acb24
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: Mon Aug 1 05:38:31 2011 -0500
fence_kdump: Fix logging
Change the log_debug and log_error macros. For fence_kdump, also write
to syslog.
Resolves: rhbz#461948
Signed-off-by: Ryan O'Hara <rohara(a)redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto(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;
}
12 years, 9 months
fence-agents: RHEL6 - fence_kdump: remove binary files from git
by rohara
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: de6f04cc3900857111f14c25a548e745322acb24
Parent: b7cd3002f10015eee5c0dffd938d961ecef1bd6e
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: Mon Aug 1 05:36:47 2011 -0500
fence_kdump: remove binary files from git
Resolves: rhbz#461948
Signed-off-by: Ryan O'Hara <rohara(a)redhat.com>
---
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
12 years, 9 months
fence-agents: RHEL6 - fence_kdump: Increase default timeout to 120
by rohara
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: b7cd3002f10015eee5c0dffd938d961ecef1bd6e
Parent: 3479030f8f4248a09bb2547e5c3312aa3a9d2f3e
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: Mon Aug 1 05:35:59 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.
Resolves: rhbz#461948
Signed-off-by: Ryan O'Hara <rohara(a)redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto(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 {
12 years, 9 months
fence-agents: RHEL6 - fence_kdump: remove FENCE_KDUMP_MSGV2
by rohara
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: 3479030f8f4248a09bb2547e5c3312aa3a9d2f3e
Parent: 15c4cb0c063e95edc1af1a5b34ca1b6b6a218972
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: Mon Aug 1 05:35:15 2011 -0500
fence_kdump: remove FENCE_KDUMP_MSGV2
FENCE_KDUMP_MSGV2 is not used at this time, so remove it.
Resolves: rhbz#461948
Signed-off-by: Ryan O'Hara <rohara(a)redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto(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;
12 years, 9 months
fence-agents: RHEL6 - fence_kdump: include ctype.h
by rohara
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=com...
Commit: 15c4cb0c063e95edc1af1a5b34ca1b6b6a218972
Parent: 490b6325630710d8c8bff032ee3b074a2d4a2cf2
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: Mon Aug 1 05:34:36 2011 -0500
fence_kdump: include ctype.h
Add ctype.h to avoid implicit declaration of isspace function.
Resolves: rhbz#461948
Signed-off-by: Ryan O'Hara <rohara(a)redhat.com>
Reviewed-by: Fabio M. Di Nitto <fdinitto(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>
12 years, 9 months
