Cluster Project branch, STABLE2, updated. gfs-kernel_0_1_22-43-g9e71edd
fabbione@sourceware.org
fabbione@sourceware.org
Tue Mar 4 07:46:00 GMT 2008
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".
http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=9e71edd75f382449fabd241962b07e3536725427
The branch, STABLE2 has been updated
via 9e71edd75f382449fabd241962b07e3536725427 (commit)
via afa3d5e83f7ff46af25658171ddc1ce6668618f1 (commit)
via 7e416ce22ae4a11fbc990176eb3676e341d60c26 (commit)
via bf98353e86c4ac1f93f9a68dce48de55908314a4 (commit)
via 1655b3aeb0d736c83cd461f84500bf630568302e (commit)
via 47efdb90db04614dd1dd4d773adc83ec9db6eeb2 (commit)
via e39f1b78c21118e6be07c1b59ee5657ba80df3a1 (commit)
from d6b422f475c286cd884c74538f500b31e17b50ec (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9e71edd75f382449fabd241962b07e3536725427
Author: Ryan McCabe <rmccabe@redhat.com>
Date: Fri Feb 29 14:35:26 2008 -0500
Feeling pedantic. More spelling fixes.
commit afa3d5e83f7ff46af25658171ddc1ce6668618f1
Author: Lon Hohberger <lhh@redhat.com>
Date: Fri Feb 29 14:15:39 2008 -0500
Fix #435189 - fenced override doesn't allow rgmanager to recover because
it doesn't tell cman that fencing was completed.
commit 7e416ce22ae4a11fbc990176eb3676e341d60c26
Author: Ryan McCabe <rmccabe@redhat.com>
Date: Fri Feb 29 12:32:03 2008 -0500
Fix a few misspellings
commit bf98353e86c4ac1f93f9a68dce48de55908314a4
Author: Ryan McCabe <rmccabe@redhat.com>
Date: Wed Feb 27 14:01:33 2008 -0500
Fix bz434790
commit 1655b3aeb0d736c83cd461f84500bf630568302e
Author: Christine Caulfield <ccaulfie@redhat.com>
Date: Wed Feb 27 11:16:34 2008 +0000
[CMAN] Don't ignore cman_tool version
the processing of the 'cman_tool version' command updates the
config_version variable immediately rather than waiting for
the message to come back. Because of this, when the message
/does/ come back it gets ignored because cman thinks it
already has the latest config!
The solution is, of course, not to update the config version
until we receive the RECONFIGURE message.
Signed-off-by: Christine Caulfield <ccaulfie@redhat.com>
commit 47efdb90db04614dd1dd4d773adc83ec9db6eeb2
Author: Lon Hohberger <lhh@ayanami.boston.devel.redhat.com>
Date: Tue Feb 26 09:41:19 2008 -0500
* Make fence_ack_manual.sh accept -n
* Ensure fence_rps10 defaults to reboot
* Make clustat not display estranged nodes which are now offline
commit e39f1b78c21118e6be07c1b59ee5657ba80df3a1
Author: Lon Hohberger <lhh@ayanami.boston.devel.redhat.com>
Date: Mon Feb 25 16:57:30 2008 -0500
Correct incorrect netmask handling in ip.sh
-----------------------------------------------------------------------
Summary of changes:
ccs/man/ccs_tool.8 | 6 +++---
cman/daemon/commands.c | 3 +--
cman/init.d/cman.in | 5 +++--
cman/man/cman.5 | 6 +++---
cman/man/cman_tool.8 | 6 +++---
cman/man/qdisk.5 | 4 ++--
dlm/man/dlm_create_lockspace.3 | 2 +-
dlm/man/libdlm.3 | 6 +++---
fence/agents/manual/fence_ack_manual.sh | 17 ++++++++++++++---
fence/agents/rps10/rps10.c | 9 ++++++---
fence/fenced/agent.c | 2 +-
fence/fenced/fd.h | 1 +
fence/fenced/recover.c | 1 +
fence/man/fence_baytech.8 | 4 ++--
fence/man/fence_bladecenter.8 | 2 +-
fence/man/fence_cpint.8 | 2 +-
fence/man/fence_drac.8 | 2 +-
fence/man/fence_egenera.8 | 2 +-
fence/man/fence_ibmblade.8 | 2 +-
fence/man/fence_vixel.8 | 2 +-
fence/man/fence_xcat.8 | 2 +-
fence/man/fenced.8 | 6 +++---
gfs/man/gfs_mount.8 | 4 ++--
gfs2/man/gfs2_grow.8 | 2 +-
gfs2/man/gfs2_jadd.8 | 2 +-
gfs2/man/gfs2_mount.8 | 4 ++--
gnbd/man/fence_gnbd.8 | 8 ++++----
gnbd/man/gnbd_export.8 | 8 ++++----
gnbd/man/gnbd_import.8 | 4 ++--
gnbd/man/gnbd_serv.8 | 2 +-
group/man/gfs_controld.8 | 2 +-
rgmanager/ChangeLog | 4 ++++
rgmanager/src/resources/ip.sh | 4 ++++
rgmanager/src/utils/clustat.c | 8 ++++++++
34 files changed, 88 insertions(+), 56 deletions(-)
diff --git a/ccs/man/ccs_tool.8 b/ccs/man/ccs_tool.8
index e8869c0..6b09905 100644
--- a/ccs/man/ccs_tool.8
+++ b/ccs/man/ccs_tool.8
@@ -35,7 +35,7 @@ sub\-commands have their own options, see below for more detail
This command is used to update the config file that ccsd is working with
while the cman cluster is operational (i.e. online). Run this on a single
machine to update cluster.conf on all current cluster members. This also
-notfies cman of the new config version.
+notifies cman of the new config version.
.TP
\fBupgrade\fP \fI<location>\fP
@@ -65,8 +65,8 @@ is using multicast as transport. Forbidden if not.
be added to the file. Subsequent nodes will use either multicast or broadcast
depending on the properties of the first node.
.br
-\-f <fencedevice> Name of fence devcie to use for this node. The fence device
-section must already have been addded to the file, probably using the addfence command.
+\-f <fencedevice> Name of fence device to use for this node. The fence device
+section must already have been added to the file, probably using the addfence command.
.br
\-c <file> Config file to use. Defaults to /etc/cluster/cluster.conf
.br
diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c
index ec9fe1e..e090674 100644
--- a/cman/daemon/commands.c
+++ b/cman/daemon/commands.c
@@ -439,9 +439,8 @@ static int do_cmd_set_version(char *cmdbuf, int *retlen)
if (config_version == version->config)
return 0;
- config_version = version->config;
/* We will re-read CCS when we get our own message back */
- send_reconfigure(us->node_id, RECONFIG_PARAM_CONFIG_VERSION, config_version);
+ send_reconfigure(us->node_id, RECONFIG_PARAM_CONFIG_VERSION, version->config);
return 0;
}
diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 0fcdd75..e357934 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -165,7 +165,7 @@ xend_bridged_net_enabled() {
return 1
fi
- egrep "^[[:blank:]]*\([[:blank:]]*network-script[[:blank:]]+(')*[[:blank:]]*network-bridge([[:blank:]]*\)|[[:blank:]]+)" /etc/xen/xend-config.sxp >&/dev/null
+ egrep "^[[:blank:]]*\([[:blank:]]*network-script[[:blank:]]+(')?[[:blank:]]*network-bridge([[:blank:]]*\)|[[:blank:]]+)" /etc/xen/xend-config.sxp >&/dev/null
if [ $? -ne 0 ]; then
# xend isn't configured to use bridged networking.
return 1
@@ -185,7 +185,8 @@ xend_bridged_net_start() {
/sbin/modprobe netbk >& /dev/null
/sbin/modprobe netloop >& /dev/null
- errmsg=$(/etc/xen/scripts/network-bridge start 2>&1) || return 1
+ bridge_parms=`egrep -m 1 "^[[:blank:]]*\([[:blank:]]*network-script[[:blank:]]+(')?[[:blank:]]*network-bridge([[:blank:]]*\)|[[:blank:]]+)" /etc/xen/xend-config.sxp| sed -r "s/^[[:blank:]]*\([[:blank:]]*network-script[[:blank:]]+'?[[:blank:]]*network-bridge[[:blank:]]*//; s/'?[[:blank:]]*\).*//"`
+ errmsg=$(/etc/xen/scripts/network-bridge start $bridge_parms 2>&1) || return 1
return 0
}
diff --git a/cman/man/cman.5 b/cman/man/cman.5
index 63c271d..890f531 100644
--- a/cman/man/cman.5
+++ b/cman/man/cman.5
@@ -43,7 +43,7 @@ This will cause cman to use ports 6809 and 6808 for cluster communications.
The expected votes value is used by cman to determine quorum. The cluster is
quorate if the sum of votes of existing members is over half of the expected
votes value. By default, cman sets the expected votes value to be the sum
-of votes of all nodes listed in cluster.conf. This can be overriden by setting
+of votes of all nodes listed in cluster.conf. This can be overridden by setting
an explicit expected_votes value as follows:
<cman expected_votes="3">
@@ -94,12 +94,12 @@ the nodeid to one that is already used.
.in -7
\fIMulti-home configuration\fR
.in +7
-It is quite common to use multiple ethernet adaptors for cluster nodes, so
+It is quite common to use multiple ethernet adapters for cluster nodes, so
they will tolerate the failure of one link. A common way to do this is to use
ethernet bonding. Alternatively you can get openais to run in redundant ring
mode by specifying an 'altname' for the node. This is an alternative name by
which the node is known, that resolves to another IP address used on the
-other ethernet adaptor(s). You can optionally specify a different port and/or
+other ethernet adapter(s). You can optionally specify a different port and/or
multicast address for each altname in use. Up to 9 altnames (10 interfaces
in total) can be used.
diff --git a/cman/man/cman_tool.8 b/cman/man/cman_tool.8
index 7ea577b..726ca0e 100644
--- a/cman/man/cman_tool.8
+++ b/cman/man/cman_tool.8
@@ -238,14 +238,14 @@ Tells cman not to use CCS to get cluster information. If you use this option the
apply several defaults to the cluster to get it going. The cluster name will be
"RHCluster", node IDs will default to the IP address of the node and remote node
names will show up as Node<nodeid>. All of these, apart from the node names can
-be overridded on the cman_tool command-line if required.
+be overridden on the cman_tool command-line if required.
.br
If you have to set up fence devices, services or anything else in cluster.conf then
this option is probably not worthwhile to you - the extra readability of sensible node
names and numbers will make it worth using CCS for the cluster too. But for a simple
failover cluster this might save you some effort.
.br
-On each node using this configuration you will need to have the same authorisation key
+On each node using this configuration you will need to have the same authorization key
installed. To create this key run
.br
mkdir /etc/ais
@@ -274,7 +274,7 @@ name as it appears in 'cman_tool nodes'.
.TP
.I -F <format>
Specify the format of the output. The format string may contain one or
-more format options, each seperated by a comma. Valid format options
+more format options, each separated by a comma. Valid format options
include: id, name, type, and addr.
.br
.SH "DEBUG" OPTIONS
diff --git a/cman/man/qdisk.5 b/cman/man/qdisk.5
index f596e39..569563c 100644
--- a/cman/man/qdisk.5
+++ b/cman/man/qdisk.5
@@ -60,7 +60,7 @@ if the timeouts are set high enough.
.SH "1.3.3. Fencing is Required"
In order to maintain data integrity under all failure scenarios, use of
-this quorum daemon requires adequate fencing, preferrably power-based
+this quorum daemon requires adequate fencing, preferably power-based
fencing. Watchdog timers and software-based solutions to reboot the node
internally, while possibly sufficient, are not considered 'fencing' for
the purposes of using the quorum disk.
@@ -115,7 +115,7 @@ timestamp), a node is declared offline. After a certain number of 'hits'
The status block contains additional information, such as a bitmask of
the nodes that node believes are online. Some of this information is
-used by the master - while some is just for performace recording, and
+used by the master - while some is just for performance recording, and
may be used at a later time. The most important pieces of information
a node writes to its status block are:
diff --git a/dlm/man/dlm_create_lockspace.3 b/dlm/man/dlm_create_lockspace.3
index fb0a781..3879e85 100644
--- a/dlm/man/dlm_create_lockspace.3
+++ b/dlm/man/dlm_create_lockspace.3
@@ -35,7 +35,7 @@ EINVAL An invalid parameter was passed to the call
ENOMEM A (kernel) memory allocation failed
EEXIST The lockspace already exists
EPERM Process does not have capability to create lockspaces
-ENOSYS A fatal error occurred initialising the DLM
+ENOSYS A fatal error occurred initializing the DLM
Any error returned by the open() system call
.fi
.SS
diff --git a/dlm/man/libdlm.3 b/dlm/man/libdlm.3
index 4bb5257..0782a2c 100644
--- a/dlm/man/libdlm.3
+++ b/dlm/man/libdlm.3
@@ -14,11 +14,11 @@ int dlm_dispatch(int fd);
link with -ldlm
.fi
.SH DESCRIPTION
-libdlm provides the programmatic userspace interface to the Distributed Lock manager. It provides all the calls you need to maniupulate locks & lockspaces
+libdlm provides the programmatic userspace interface to the Distributed Lock manager. It provides all the calls you need to manipulate locks & lockspaces
.br
libdlm can be used in pthread or non-pthread applications. For pthread applications simply call the following function before doing any lock operations. If you're using pthreads, remember to define _REENTRANT at the top of the program or using -D_REENTRANT on the compile line.
.br
-pthreads is the normal way of using the DLM. This way you simply initialise the DLM's thread and all the AST routines will be delivered in that thread. You just call the dlm_lock() etc routines in the main line of your program.
+pthreads is the normal way of using the DLM. This way you simply initialize the DLM's thread and all the AST routines will be delivered in that thread. You just call the dlm_lock() etc routines in the main line of your program.
.br
If you don't want to use pthreads or you want to handle the dlm callback ASTs yourself then you can get an FD handle to the DLM device and call
.B dlm_dispatch()
@@ -32,7 +32,7 @@ Creates a thread to receive all lock ASTs. The AST callback function for lock op
.PP
.SS int dlm_ls_pthread_init(dlm_lshandle_t lockspace)
.br
-As dlm_pthread_init but initialises a thread for the specified lockspace.
+As dlm_pthread_init but initializes a thread for the specified lockspace.
.PP
.SS int dlm_pthread_cleanup()
.br
diff --git a/fence/agents/manual/fence_ack_manual.sh b/fence/agents/manual/fence_ack_manual.sh
index 8d3a428..0f29745 100755
--- a/fence/agents/manual/fence_ack_manual.sh
+++ b/fence/agents/manual/fence_ack_manual.sh
@@ -1,14 +1,25 @@
#!/bin/bash
#
-# Dummy fence_ack_manual which uses the fenced manual override
-# socket to communicate.
+###############################################################################
+###############################################################################
+##
+## COPYRIGHT (C) 2007 RED HAT, INC.
+##
+## THIS COPYRIGHTED MATERIAL IS MADE AVAILABLE TO ANYONE WISHING TO USE,
+## MODIFY, COPY, OR REDISTRIBUTE IT SUBJECT TO THE TERMS AND CONDITIONS
+## OF THE GNU GENERAL PUBLIC LICENSE V.2.
+##
+###############################################################################
+###############################################################################
+#
+# Manual override after fencing has failed.
#
if [ "$1" = "-n" ]; then
shift
fi
-if [ -z "$1" ]; then
+if [ -z "$1" ] || [ "$1" = "-h" ]; then
echo "usage:"
echo " $0 <nodename>"
echo " $0 -n <nodename>"
diff --git a/fence/agents/rps10/rps10.c b/fence/agents/rps10/rps10.c
index 065920c..00df528 100644
--- a/fence/agents/rps10/rps10.c
+++ b/fence/agents/rps10/rps10.c
@@ -39,6 +39,10 @@
#include <libgen.h>
#include "copyright.cf"
+#ifndef RELEASE_VERSION
+#define RELEASE_VERSION "sandbox"
+#endif
+
/*
* Salt to taste.
@@ -144,7 +148,7 @@ printf(" -d <device> Use serial device <dev>. Default=%s\n",
printf(" -s <speed> Use speed <speed>. Default=9600\n"
" Valid speeds: 300, 1200, 2400, 9600\n");
printf(" -o <op> Operation to perform.\n");
-printf(" Valid operations: on, off, reboot\n");
+printf(" Valid operations: on, off, [reboot]\n");
printf(" -V Print version and exit\n");
printf(" -v Verbose mode\n\n");
printf("If no options are specified, the following options will be read\n");
@@ -314,8 +318,6 @@ get_options_stdin(char *dev, size_t devlen, int *speed, int *port,
int line = 0;
char *name, *val;
- op[0] = 0;
-
while (fgets(in, sizeof(in), stdin)) {
++line;
@@ -396,6 +398,7 @@ main(int argc, char **argv)
char *pname = basename(argv[0]);
strncpy(dev, DEFAULT_DEVICE, sizeof(dev));
+ strncpy(op, "reboot", sizeof(op));
if (argc > 1) {
/*
diff --git a/fence/fenced/agent.c b/fence/fenced/agent.c
index cf32c97..1bb9f12 100644
--- a/fence/fenced/agent.c
+++ b/fence/fenced/agent.c
@@ -279,7 +279,7 @@ static int use_device(int cd, char *victim, char *method, int d,
return error;
}
-static void update_cman(char *victim, char *method)
+void update_cman(char *victim, char *method)
{
cman_handle_t ch;
struct cman_node node;
diff --git a/fence/fenced/fd.h b/fence/fenced/fd.h
index c69e927..990190e 100644
--- a/fence/fenced/fd.h
+++ b/fence/fenced/fd.h
@@ -195,5 +195,6 @@ int update_cluster_members(void);
int is_member(char *name);
int is_fenced(char *name);
fd_node_t *get_new_node(fd_t *fd, int nodeid, char *in_name);
+void update_cman(char *victim, char *agent);
#endif /* __FD_DOT_H__ */
diff --git a/fence/fenced/recover.c b/fence/fenced/recover.c
index 08ef8ab..ffccd3c 100644
--- a/fence/fenced/recover.c
+++ b/fence/fenced/recover.c
@@ -407,6 +407,7 @@ static void fence_victims(fd_t *fd, int start_type)
syslog(LOG_WARNING, "fence \"%s\" overridden by "
"administrator intervention", node->name);
+ update_cman(node->name, "override");
list_del(&node->list);
free(node);
}
diff --git a/fence/man/fence_baytech.8 b/fence/man/fence_baytech.8
index 1cd77e1..4083c33 100644
--- a/fence/man/fence_baytech.8
+++ b/fence/man/fence_baytech.8
@@ -20,8 +20,8 @@ fence_baytech
This fencing agent is written for the Baytech RPC27-20nc in combination with
a Cyclades terminal server. The Cyclades TS exports the RPC's serial port
via a Telnet interface. Other interfaces, such as SSH, are possible.
-However, this script relys upon the assumption that Telnet is used. Future
-features to this agent would allow the agent to work with a mulitude of
+However, this script relies upon the assumption that Telnet is used. Future
+features to this agent would allow the agent to work with a multitude of
different communication protocols such as Telnet, SSH or Kermit.
The other assumption that is made is that Outlet names do not end in space.
diff --git a/fence/man/fence_bladecenter.8 b/fence/man/fence_bladecenter.8
index a2f7143..3efe4dc 100644
--- a/fence/man/fence_bladecenter.8
+++ b/fence/man/fence_bladecenter.8
@@ -18,7 +18,7 @@ fence_bladecenter
.SH DESCRIPTION
fence_bladecenter is an I/O Fencing agent which can be used with IBM Bladecenters
with recent enough firmware that includes telnet support. It logs into a Brocade
-chasis via telnet and uses the command line interface to power on and off blades.
+chassis via telnet and uses the command line interface to power on and off blades.
fence_bladecenter accepts options on the command line or from stdin.
.SH OPTIONS
diff --git a/fence/man/fence_cpint.8 b/fence/man/fence_cpint.8
index e3c47f8..19ffa96 100644
--- a/fence/man/fence_cpint.8
+++ b/fence/man/fence_cpint.8
@@ -25,7 +25,7 @@ and hcp in your PATH.
\fBNOTE:\fP for fence_cpint to send a command to another virtual machine, the
machine executing it must either be a privilege class C user or it must be
the secondary user of the virtual machine to be fenced. This means that unless
-all of you gulm server nodes are privilege class C, fence_cpint can only be
+all of you GULM server nodes are privilege class C, fence_cpint can only be
used with SLM.
fence_cpint accepts options on the command line as well as from stdin.
diff --git a/fence/man/fence_drac.8 b/fence/man/fence_drac.8
index ff3707b..a3909bf 100644
--- a/fence/man/fence_drac.8
+++ b/fence/man/fence_drac.8
@@ -16,7 +16,7 @@ fence_drac
.SH DESCRIPTION
fence_drac is an I/O Fencing agent which can be used with the Dell Remote
-Access Card (DRAC). This card provides remote access to controling
+Access Card (DRAC). This card provides remote access to controlling
power to a server. It logs into the DRAC through the telnet interface of
the card. By default, the telnet interface is not enabled. To enable the
interface, you will need to use the racadm command in the racser-devel rpm
diff --git a/fence/man/fence_egenera.8 b/fence/man/fence_egenera.8
index 46f5a06..e3128bb 100644
--- a/fence/man/fence_egenera.8
+++ b/fence/man/fence_egenera.8
@@ -47,7 +47,7 @@ The action required. reboot (default), off, on or status.
the pserver to operate on
.TP
\fB-q\fP
-quite mode. supress output.
+quite mode. suppress output.
.TP
\fB-V\fP
Print out a version message, then exit.
diff --git a/fence/man/fence_ibmblade.8 b/fence/man/fence_ibmblade.8
index a3245be..a77f3cf 100644
--- a/fence/man/fence_ibmblade.8
+++ b/fence/man/fence_ibmblade.8
@@ -17,7 +17,7 @@ fence_ibmblade
.SH DESCRIPTION
fence_ibmblade is an I/O Fencing agent which can be used with IBM BladeCenter
-chassis. It issues SNMP Set request to BladeCenter chassins, rebooting, powering
+chassis. It issues SNMP Set request to BladeCenter chassis, rebooting, powering
up or down the specified Blade Server.
fence_ibmblade accepts options on the command line as well as from stdin.
diff --git a/fence/man/fence_vixel.8 b/fence/man/fence_vixel.8
index c105dde..e0f6c4d 100644
--- a/fence/man/fence_vixel.8
+++ b/fence/man/fence_vixel.8
@@ -73,5 +73,5 @@ Full path to an executable to generate the password for login.
\fIport = < param >\fR
The port number to remove zoning from on the switch.
-.SH BSEE ALSO
+.SH SEE ALSO
fence(8), fence_node(8)
diff --git a/fence/man/fence_xcat.8 b/fence/man/fence_xcat.8
index 3aaa620..c2a59fd 100644
--- a/fence/man/fence_xcat.8
+++ b/fence/man/fence_xcat.8
@@ -14,7 +14,7 @@ fence_xcat
.SH DESCRIPTION
fence_xcat is a wrapper to the rpower(1) command that is distributed
with the xCAT project available at http://www.xcat.org. Use of
-fence_xcat requires that xcat has already been properlly configfured
+fence_xcat requires that xcat has already been properly configured
for your environment. Refer to xCAT(1) for more information on
configuring xCAT.
diff --git a/fence/man/fenced.8 b/fence/man/fenced.8
index 91eb510..991cd83 100644
--- a/fence/man/fenced.8
+++ b/fence/man/fenced.8
@@ -71,7 +71,7 @@ it) and subsequently enabled (by the cluster gaining quorum) any nodes
listed in cluster.conf that are not presently members of the cman cluster
are fenced. The status of these nodes is unknown, and to be on the side
of safety they are assumed to be in need of fencing. This startup fencing
-can be disabled, but it's only truely safe to do so if an operator is
+can be disabled, but it's only truly safe to do so if an operator is
present to verify that no cluster nodes are in need of fencing.
This example illustrates why startup fencing is important. Take a three
@@ -119,7 +119,7 @@ continue without fencing the node.
Fencing daemon behavior can be controlled by setting options in the
cluster.conf file under the section <fence_daemon> </fence_daemon>. See
above for complete descriptions of these values. The delay values are in
-seconds; -1 secs means an unlimitted delay. The values shown are the
+seconds; -1 secs means an unlimited delay. The values shown are the
defaults.
Post-join delay is the number of seconds the daemon will wait before
@@ -267,7 +267,7 @@ Find documentation for configuring specific devices at
http://sources.redhat.com/cluster/
.SH OPTIONS
-Command line options override corresonding values in cluster.conf.
+Command line options override corresponding values in cluster.conf.
.TP
\fB-j\fP \fIsecs\fP
Post-join fencing delay
diff --git a/gfs/man/gfs_mount.8 b/gfs/man/gfs_mount.8
index 13418fd..53ebbdc 100644
--- a/gfs/man/gfs_mount.8
+++ b/gfs/man/gfs_mount.8
@@ -133,7 +133,7 @@ a cluster filesystem can cause the filesystem to stall on all machines
in the cluster. (Panics don't have this "feature".) By turning on
"panic_on_oops", GFS tries to make sure the cluster remains in
operation even if one machine has a problem. There are cases,
-however, where this behavior is not desireable -- debugging being
+however, where this behavior is not desirable -- debugging being
the main one. The \fBoopses_ok\fP option causes GFS to leave the
"panic_on_oops" variable alone so oopses can happen. Use this option
with care.
@@ -157,7 +157,7 @@ message that you need to upgrade. Try mounting again, using the
filesystem.
.TP
\fBnum_glockd\fP
-Tunes GFS to alleviate memory pressure when rapidly aquiring many locks (e.g.
+Tunes GFS to alleviate memory pressure when rapidly acquiring many locks (e.g.
several processes scanning through huge directory trees). GFS' glockd kernel
daemon cleans up memory for no-longer-needed glocks. Multiple instances
of the daemon clean up faster than a single instance. The default value is
diff --git a/gfs2/man/gfs2_grow.8 b/gfs2/man/gfs2_grow.8
index a16d024..85e53c1 100644
--- a/gfs2/man/gfs2_grow.8
+++ b/gfs2/man/gfs2_grow.8
@@ -39,7 +39,7 @@ of the current state of a mounted GFS2 filesystem.
.SH OPTIONS
.TP
\fB-D\fP
-Print out debbugging information about the filesystem layout.
+Print out debugging information about the filesystem layout.
.TP
\fB-h\fP
Prints out a short usage message and exits.
diff --git a/gfs2/man/gfs2_jadd.8 b/gfs2/man/gfs2_jadd.8
index ef36baa..b57ca12 100644
--- a/gfs2/man/gfs2_jadd.8
+++ b/gfs2/man/gfs2_jadd.8
@@ -36,7 +36,7 @@ process should leave your filesystem in its original state.
Initial size of each journal's quota change file
.TP
\fB-D\fP
-Print out debbugging information about the filesystem layout.
+Print out debugging information about the filesystem layout.
.TP
\fB-h\fP
Prints out a short usage message and exits.
diff --git a/gfs2/man/gfs2_mount.8 b/gfs2/man/gfs2_mount.8
index 20e1eb0..0bf8f42 100644
--- a/gfs2/man/gfs2_mount.8
+++ b/gfs2/man/gfs2_mount.8
@@ -151,7 +151,7 @@ message that you need to upgrade. Try mounting again, using the
filesystem.
.TP
\fBnum_glockd=\fP\fINumber\fR
-Tunes GFS2 to alleviate memory pressure when rapidly aquiring many locks (e.g.
+Tunes GFS2 to alleviate memory pressure when rapidly acquiring many locks (e.g.
several processes scanning through huge directory trees). GFS2' glockd kernel
daemon cleans up memory for no-longer-needed glocks. Multiple instances
of the daemon clean up faster than a single instance. The default value is
@@ -182,7 +182,7 @@ ignored. The default value is "off".
.TP
\fBdata=\fP\fI[ordered/writeback]\fR
When data=ordered is set, the user data modified by a transaction is
-flushed to the disk before the transaction is commited to disk. This
+flushed to the disk before the transaction is committed to disk. This
should prevent the user from seeing uninitialized blocks in a file
after a crash. Data=writeback mode writes the user data to the disk
at any time after it's dirtied. This doesn't provide the same
diff --git a/gnbd/man/fence_gnbd.8 b/gnbd/man/fence_gnbd.8
index c338da3..9bf185a 100644
--- a/gnbd/man/fence_gnbd.8
+++ b/gnbd/man/fence_gnbd.8
@@ -63,13 +63,13 @@ deprecated. Please use \fInodename\fP instead.
The cluster name of the node to be fenced (required)
.TP
\fIservers = < hostname [ hostname ... ] >\fP
-A whitespace seperated list of the servers to fence the client from, in
+A whitespace separated list of the servers to fence the client from, in
either IP address or hostname form.
.TP
\fIoption = multipath\fP
Select multipath style fencing. \fBWARNING:\fP When multipath style fencing is
used, if the kgnbd_portd process of a gnbd server node cannot be contacted, it
-is fenced as well, using its appropriate fencig method. This means that when
+is fenced as well, using its appropriate fencing method. This means that when
a client is fenced, any node listed as its server that does not have the
gnbd_serv module loaded (which starts kgnbd_portd) will also be fenced.
.TP
@@ -79,8 +79,8 @@ before the server is fenced. This parameter is only valid when used
with multipath style fencing (see above). The default is 3.
.TP
\fIwait_time = < param >\fP
-length of time, in seconds, to wait between retrys. This parameter
-is only valid when used with multipath sytle fencing (see above). The default
+length of time, in seconds, to wait between retries. This parameter
+is only valid when used with multipath style fencing (see above). The default
is 2.
.SH SEE ALSO
diff --git a/gnbd/man/gnbd_export.8 b/gnbd/man/gnbd_export.8
index 3eb2679..2a3a686 100644
--- a/gnbd/man/gnbd_export.8
+++ b/gnbd/man/gnbd_export.8
@@ -37,7 +37,7 @@ connects to the cluster manager via the \fBmagma\fP interface.
\fBWARNING:\fP You must NOT specify
this option if you wish to use gnbd with dm multipathing, or run GFS on gnbd
server machines. To set up dm multipathing over gnbd, all
-gnbds involved must run with caching disabled. Data corruption will occur
+GNBDs involved must run with caching disabled. Data corruption will occur
if the GNBD devices are run with caching. Any device that is exported without
the \fB-c\fP option can also be used locally, but you must access the device
directly. You MUST NOT use gnbd_import to import devices exported from the
@@ -105,7 +105,7 @@ Remove named GNBD(s).
\fB-u\fP \fIuid\fR
Manually set UID.
-Manunally set the Universal Identifier for an exported device. This option is
+Manually set the Universal Identifier for an exported device. This option is
used with \fB-e\fP. The UID is used by device-mapper-multipath to determine
which devices belong in a multipath map. A device must have a UID to be
multipathed. However, for most SCSI devices the default Get UID command
@@ -126,9 +126,9 @@ Get UID Command.
This is a command the gnbd_export will run to get a Universal Identifier for
the exported device. The UID is necessary to use device-mapper-multipath with
GNBD (see \fB-u\fP for more information). The command must use the full path
-of any executeable that you wish to run. A command can contain the %M, %m or
+of any executable that you wish to run. A command can contain the %M, %m or
%n escape sequences. %M will be expanded to the major number of the exported
-device, %m will be expaned to the minor number of the exported device, and
+device, %m will be expanded to the minor number of the exported device, and
%n will be expanded to the sysfs name for the device. If no command is given,
gnbd will use the default command \fI"/usr/sbin/gnbd_get_uid"\fR. This
command will work for most scsi devices.
diff --git a/gnbd/man/gnbd_import.8 b/gnbd/man/gnbd_import.8
index 029b135..5d59e07 100644
--- a/gnbd/man/gnbd_import.8
+++ b/gnbd/man/gnbd_import.8
@@ -29,7 +29,7 @@ restart it.
Check fenced.
List all the IP addresses currently IO fenced from the specified \fIserver\fR.
-If the sepecified server does not have any IP addresses fenced, nothing will
+If the specified server does not have any IP addresses fenced, nothing will
be returned. If the server machine is not running gnbd_serv, an error will
be returned.
.TP
@@ -146,7 +146,7 @@ Unfence.
Unfence the specified host. \fBWARNING\fP: Unfencing a client at the incorrect
time can result in data corruption. In normal operation, it should never be
-necessary to run this comman. See the \fB-t\fP option.
+necessary to run this command. See the \fB-t\fP option.
.TP
\fB-U\fP \fIGNBD\fR
Get UID.
diff --git a/gnbd/man/gnbd_serv.8 b/gnbd/man/gnbd_serv.8
index 9551093..fa5e686 100644
--- a/gnbd/man/gnbd_serv.8
+++ b/gnbd/man/gnbd_serv.8
@@ -11,7 +11,7 @@ gnbd_serv - gnbd server daemon
.SH DESCRIPTION
gnbd_serv manages gnbd devices exported by gnbd_export and connections from
-gnbd_import. It servs up data from the local disks to the connected gnbd
+gnbd_import. It serves up data from the local disks to the connected gnbd
clients.
.SH OPTIONS
diff --git a/group/man/gfs_controld.8 b/group/man/gfs_controld.8
index 60b00d3..1c699b8 100644
--- a/group/man/gfs_controld.8
+++ b/group/man/gfs_controld.8
@@ -60,7 +60,7 @@ cannot interoperate with older versions that did not support this option.
Three options can be used to tune the behavior of the plock_ownership
optimization. All three relate to the caching of lock ownership state.
-Specifically, they define how agressively cached ownership state is dropped.
+Specifically, they define how aggressively cached ownership state is dropped.
More caching of ownership state can result in better performance, at the
expense of more memory usage.
diff --git a/rgmanager/ChangeLog b/rgmanager/ChangeLog
index eda28eb..249e6ca 100644
--- a/rgmanager/ChangeLog
+++ b/rgmanager/ChangeLog
@@ -1,3 +1,7 @@
+2008-02-26 Lon Hohberger <lhh at redhat.com>
+ * src/resources/ip.sh: Fix netmask handling in ip.sh
+ * src/utils/clustat.c: Don't show estranged nodes if they're down
+
2008-01-25 Lon Hohberger <lhh at redhat.com>
* src/daemons/rg_thread.c: Fix case that broke 'clusvcadm -e <service>
-n <node>' case #430220
diff --git a/rgmanager/src/resources/ip.sh b/rgmanager/src/resources/ip.sh
index b0bef76..fe97391 100755
--- a/rgmanager/src/resources/ip.sh
+++ b/rgmanager/src/resources/ip.sh
@@ -692,6 +692,10 @@ ipv4()
if [ $? -ne 0 ]; then
continue
fi
+
+ if [ "${addr/\/*/}" = "${addr}" ]; then
+ addr="$addr/$maskbits"
+ fi
ocf_log info "Adding IPv4 address $addr to $dev"
fi
if [ "$1" = "del" ]; then
diff --git a/rgmanager/src/utils/clustat.c b/rgmanager/src/utils/clustat.c
index 23c0492..ed9b29b 100644
--- a/rgmanager/src/utils/clustat.c
+++ b/rgmanager/src/utils/clustat.c
@@ -719,6 +719,10 @@ build_member_field_size(int cols, int *nodesize)
void
txt_member_state(cman_node_t *node, int nodesize)
{
+ /* If it's down and not in cluster.conf, don't show it */
+ if ((node->cn_member & (FLAG_NOCFG | FLAG_UP)) == FLAG_NOCFG)
+ return;
+
printf(" %-*.*s ", nodesize, nodesize, node->cn_name);
printf("%4d ", node->cn_nodeid);
@@ -754,6 +758,10 @@ txt_member_state(cman_node_t *node, int nodesize)
void
xml_member_state(cman_node_t *node)
{
+ /* If it's down and not in cluster.conf, don't show it */
+ if ((node->cn_member & (FLAG_NOCFG | FLAG_UP)) == FLAG_NOCFG)
+ return;
+
printf(" <node name=\"%s\" state=\"%d\" local=\"%d\" "
"estranged=\"%d\" rgmanager=\"%d\" rgmanager_master=\"%d\" "
"qdisk=\"%d\" nodeid=\"0x%08x\"/>\n",
hooks/post-receive
--
Cluster Project
More information about the Cluster-cvs
mailing list