September 2010 - cluster-commits - Fedora Mailing-Lists

gfs2-utils: master - GFS2: Clean up initscript

by Steven Whitehouse

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitd... Commit: e7fb6bc9caff6fd68e216494eb2d810e88b38867 Parent: 756fbe385cb52d28478bca7d6f516cbefb19a06d Author: Steven Whitehouse <swhiteho(a)redhat.com> AuthorDate: Thu Sep 30 15:43:48 2010 +0100 Committer: Steven Whitehouse <swhiteho(a)redhat.com> CommitterDate: Thu Sep 30 15:43:48 2010 +0100 GFS2: Clean up initscript The initscript for GFS2 appeared to have been set up with macros to be filled in by the build system. The build system doesn't actually do that, though. This renames the initscript back to its original name and removes the two macros which were included. Since it is by definition a script, we can just add a line or two to check for files being in different places if required. There is no need to do that via the build system. Signed-off-by: Steven Whitehouse <swhiteho(a)redhat.com> --- gfs2/init.d/gfs2 | 131 +++++++++++++++++++++++++++++++++++++++++++++++++++ gfs2/init.d/gfs2.in | 131 --------------------------------------------------- 2 files changed, 131 insertions(+), 131 deletions(-) diff --git a/gfs2/init.d/gfs2 b/gfs2/init.d/gfs2 new file mode 100644 index 0000000..d4c00ea --- /dev/null +++ b/gfs2/init.d/gfs2 @@ -0,0 +1,131 @@ +#!/bin/bash +# +# gfs2 mount/unmount helper +# +# chkconfig: - 26 74 +# description: mount/unmount gfs2 filesystems configured in /etc/fstab + +### BEGIN INIT INFO +# Provides: gfs2 +# Required-Start: $network cman +# Required-Stop: $network cman +# Default-Start: +# Default-Stop: +# Short-Description: mount/unmount gfs2 filesystems configured in /etc/fstab +# Description: mount/unmount gfs2 filesystems configured in /etc/fstab +### END INIT INFO + +# set secure PATH +PATH="/bin:/sbin:/usr/sbin:/usr/bin" + +### generic wrapper functions + +success() +{ + echo -ne "[ OK ]\r" +} + +failure() +{ + echo -ne "[FAILED]\r" +} + +ok() { + success + echo +} + +nok() { + echo -e "$errmsg" + failure + echo + exit 1 +} + +# rpm based distros +if [ -d /etc/sysconfig ]; then + [ -f /etc/init.d/functions ] && . /etc/init.d/functions + [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster + [ -f /etc/sysconfig/gfs2 ] && . /etc/sysconfig/gfs2 + [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/subsys/gfs2" +fi + +# deb based distros +if [ -d /etc/default ]; then + [ -f /etc/default/cluster ] && . /etc/default/cluster + [ -f /etc/default/gfs2 ] && . /etc/default/gfs2 + [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/gfs2" +fi + +# proc is required for both status and stop. +# start could live without, but better be consistent with the behavior +if [ ! -f /proc/mounts ]; then + echo "GFS2: /proc is not available, unable to proceed" + exit 1 +fi + +# +# This script's behavior is modeled closely after the netfs script. +# +GFS2FSTAB=$(LC_ALL=C awk '!/^#/ && $3 == "gfs2" && $4 !~ /noauto/ { print $2 }' /etc/fstab) +GFS2MTAB=$(LC_ALL=C awk '!/^#/ && $3 == "gfs2" && $2 != "/" { print $2 }' /proc/mounts) + +if [ -z "$GFS2FSTAB" ]; then + echo "GFS2: no entries found in /etc/fstab" + exit 6 +fi + +# See how we were called. +case "$1" in +start) + [ -z "$GFS2FSTAB" ] && exit 0 + echo -n "Mounting GFS2 filesystems: " + errmsg="$(mount -a -t gfs2 2>&1)" || nok + touch $LOCK_FILE + ok +;; +stop) + [ -z "$GFS2MTAB" ] && exit 0 + echo -n "Unmounting GFS2 filesystems: " + errmsg="$(umount -a -t gfs2 2>&1)" || nok + modprobe -r gfs2 > /dev/null 2>&1 || true + rm -f $LOCK_FILE + ok + ;; + +status) + if [ -z "$GFS2MTAB" ] && [ -f $LOCK_FILE ]; then + echo "GFS2: Found stale lock file $LOCK_FILE" + exit 2 + fi + + if [ -n "$GFS2FSTAB" ] && [ -z "$GFS2MTAB" ]; then + echo "GFS2: service is not running" + exit 3 + fi + + echo "Configured GFS2 mountpoints: " + for fs in $GFS2FSTAB; do + echo $fs; + done + + echo "Active GFS2 mountpoints: " + for fs in $GFS2MTAB; do + echo $fs; + done +;; +condrestart|try-restart) + $0 status >/dev/null 2>&1 || exit 0 + $0 restart +;; +restart|reload|force-reload) + $0 stop + $0 start +;; +*) + echo "Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|status}" + exit 2 +;; +esac + +exit 0 diff --git a/gfs2/init.d/gfs2.in b/gfs2/init.d/gfs2.in deleted file mode 100644 index e957a36..0000000 --- a/gfs2/init.d/gfs2.in +++ /dev/null @@ -1,131 +0,0 @@ -#!/bin/bash -# -# gfs2 mount/unmount helper -# -# chkconfig: - 26 74 -# description: mount/unmount gfs2 filesystems configured in /etc/fstab - -### BEGIN INIT INFO -# Provides: gfs2 -# Required-Start: $network cman -# Required-Stop: $network cman -# Default-Start: -# Default-Stop: -# Short-Description: mount/unmount gfs2 filesystems configured in /etc/fstab -# Description: mount/unmount gfs2 filesystems configured in /etc/fstab -### END INIT INFO - -# set secure PATH -PATH="/bin:/usr/bin:/sbin:/usr/sbin:@SBINDIR@" - -### generic wrapper functions - -success() -{ - echo -ne "[ OK ]\r" -} - -failure() -{ - echo -ne "[FAILED]\r" -} - -ok() { - success - echo -} - -nok() { - echo -e "$errmsg" - failure - echo - exit 1 -} - -# rpm based distros -if [ -d /etc/sysconfig ]; then - [ -f @INITDDIR@/functions ] && . @INITDDIR@/functions - [ -f /etc/sysconfig/cluster ] && . /etc/sysconfig/cluster - [ -f /etc/sysconfig/gfs2 ] && . /etc/sysconfig/gfs2 - [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/subsys/gfs2" -fi - -# deb based distros -if [ -d /etc/default ]; then - [ -f /etc/default/cluster ] && . /etc/default/cluster - [ -f /etc/default/gfs2 ] && . /etc/default/gfs2 - [ -z "$LOCK_FILE" ] && LOCK_FILE="/var/lock/gfs2" -fi - -# proc is required for both status and stop. -# start could live without, but better be consistent with the behavior -if [ ! -f /proc/mounts ]; then - echo "GFS2: /proc is not available, unable to proceed" - exit 1 -fi - -# -# This script's behavior is modeled closely after the netfs script. -# -GFS2FSTAB=$(LC_ALL=C awk '!/^#/ && $3 == "gfs2" && $4 !~ /noauto/ { print $2 }' /etc/fstab) -GFS2MTAB=$(LC_ALL=C awk '!/^#/ && $3 == "gfs2" && $2 != "/" { print $2 }' /proc/mounts) - -if [ -z "$GFS2FSTAB" ]; then - echo "GFS2: no entries found in /etc/fstab" - exit 6 -fi - -# See how we were called. -case "$1" in -start) - [ -z "$GFS2FSTAB" ] && exit 0 - echo -n "Mounting GFS2 filesystems: " - errmsg="$(mount -a -t gfs2 2>&1)" || nok - touch $LOCK_FILE - ok -;; -stop) - [ -z "$GFS2MTAB" ] && exit 0 - echo -n "Unmounting GFS2 filesystems: " - errmsg="$(umount -a -t gfs2 2>&1)" || nok - modprobe -r gfs2 > /dev/null 2>&1 || true - rm -f $LOCK_FILE - ok - ;; - -status) - if [ -z "$GFS2MTAB" ] && [ -f $LOCK_FILE ]; then - echo "GFS2: Found stale lock file $LOCK_FILE" - exit 2 - fi - - if [ -n "$GFS2FSTAB" ] && [ -z "$GFS2MTAB" ]; then - echo "GFS2: service is not running" - exit 3 - fi - - echo "Configured GFS2 mountpoints: " - for fs in $GFS2FSTAB; do - echo $fs; - done - - echo "Active GFS2 mountpoints: " - for fs in $GFS2MTAB; do - echo $fs; - done -;; -condrestart|try-restart) - $0 status >/dev/null 2>&1 || exit 0 - $0 restart -;; -restart|reload|force-reload) - $0 stop - $0 start -;; -*) - echo "Usage: $0 {start|stop|restart|reload|force-reload|condrestart|try-restart|status}" - exit 2 -;; -esac - -exit 0

13 years, 6 months

1
0
0 / 0

gfs2-utils: master - GFS2: Add man page for tunegfs2

by Steven Whitehouse

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitd... Commit: 756fbe385cb52d28478bca7d6f516cbefb19a06d Parent: 8ac98f94ce5d2bae84b72047bb70995fb6b1abb0 Author: Steven Whitehouse <swhiteho(a)redhat.com> AuthorDate: Thu Sep 30 15:02:52 2010 +0100 Committer: Steven Whitehouse <swhiteho(a)redhat.com> CommitterDate: Thu Sep 30 15:02:52 2010 +0100 GFS2: Add man page for tunegfs2 Just noticed that we don't have one, so.... Signed-off-by: Steven Whitehouse <swhiteho(a)redhat.com> --- gfs2/man/Makefile.am | 3 +- gfs2/man/tunegfs2.8 | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletions(-) diff --git a/gfs2/man/Makefile.am b/gfs2/man/Makefile.am index 0bc1af1..0f132d6 100644 --- a/gfs2/man/Makefile.am +++ b/gfs2/man/Makefile.am @@ -9,4 +9,5 @@ dist_man_MANS = fsck.gfs2.8 \ gfs2_quota.8 \ gfs2_tool.8 \ mkfs.gfs2.8 \ - mount.gfs2.8 + mount.gfs2.8 \ + tunegfs2.8 diff --git a/gfs2/man/tunegfs2.8 b/gfs2/man/tunegfs2.8 new file mode 100644 index 0000000..fcdc954 --- /dev/null +++ b/gfs2/man/tunegfs2.8 @@ -0,0 +1,54 @@ +.TH tunegfs2 8 + +.SH NAME +tunegfs2 - View and manipulate gfs2 superblocks + +.SH SYNOPSIS +.B tunegfs2 +[\fIOPTIONS\fR] +/dev/blockdevice + +.SH DESCRIPTION +tunegfs2 allows viewing and manipulating the values contained in a +GFS or GFS2 superblock. It is able to modify the \fIUUID\fR (on GFS2 only), +\fIlabel\fR, \fIlockproto\fR and \fIlocktable\fR. Run without any options, +this command will print out information about the content of the superblock. + +The values in the GFS2 superblock are read only on mount. Any +changes on a live filesystem will not take effect until the next +time it is mounted. Making changes on a live filesystem is not +recommended for this reason. + +.SH OPTIONS + +.TP +\fB-h\fP + +Prints out usage infomration for this command. + +.TP +\fB-L\fP \fI<label>\fR + +Change the filesystem label. Note that the GFS2 filesystem label is +also the locktable name. + +.TP +\fB-o\fP \fI[lockproto=<proto>]\fR \fI[locktable=<table>]\fR + +Set mount options. Currently supported options include lockproto and +locktable + +.TP +\fB-U\fP \fI<uuid>\fR + +Set the filesystem UUID + +.TP +\fB-V\fP + +Print out the information on the version of the tool. + +.SH SEE ALSO + +\fBgfs2\fP(5) +

13 years, 6 months

1
0
0 / 0

gfs2-utils: master - GFS2: Man page update

by Steven Whitehouse

Gitweb: http://git.fedorahosted.org/git/gfs2-utils.git?p=gfs2-utils.git;a=commitd... Commit: 8ac98f94ce5d2bae84b72047bb70995fb6b1abb0 Parent: cc703e11a2fd3c8adf09d13742b5cfa76f3091d3 Author: Steven Whitehouse <swhiteho(a)redhat.com> AuthorDate: Thu Sep 30 14:27:12 2010 +0100 Committer: Steven Whitehouse <swhiteho(a)redhat.com> CommitterDate: Thu Sep 30 14:27:12 2010 +0100 GFS2: Man page update When we no longer have mount.gfs2, we will still need somewhere to document the mount options. This patch adds that infomration to the gfs2 man page, and moves that man page into section 5 of the manual to match other filesystems. Signed-off-by: Steven Whitehouse <swhiteho(a)redhat.com> --- gfs2/man/Makefile.am | 2 +- gfs2/man/gfs2.5 | 198 +++++++++++++++++++++++++++++++++++++++++++++++++ gfs2/man/gfs2.8 | 40 ---------- gfs2/man/mount.gfs2.8 | 2 +- 4 files changed, 200 insertions(+), 42 deletions(-) diff --git a/gfs2/man/Makefile.am b/gfs2/man/Makefile.am index ac7c2fc..0bc1af1 100644 --- a/gfs2/man/Makefile.am +++ b/gfs2/man/Makefile.am @@ -1,7 +1,7 @@ MAINTAINERCLEANFILES = Makefile.in dist_man_MANS = fsck.gfs2.8 \ - gfs2.8 \ + gfs2.5 \ gfs2_convert.8 \ gfs2_edit.8 \ gfs2_grow.8 \ diff --git a/gfs2/man/gfs2.5 b/gfs2/man/gfs2.5 new file mode 100644 index 0000000..25effdd --- /dev/null +++ b/gfs2/man/gfs2.5 @@ -0,0 +1,198 @@ +.TH gfs2 5 + +.SH NAME +gfs2 \- GFS2 reference guide + +.SH SYNOPSIS +Overview of the GFS2 filesystem + +.SH DESCRIPTION + +GFS2 is a clustered filesystem, designed for sharing data between +multiple nodes +connected to a common shared storage device. It can also be used as a +local filesystem on a single node, however since the design is aimed +at clusters, that will usually result in lower performance than using +a filesystem designed specifically for single node use. + +GFS2 is a journaling filesystem and one journal is required for each node +that will mount the filesystem. The one exception to that is spectator +mounts which are equivalent to mounting a read-only block device and as +such can neither recover a journal or write to the filesystem, so do not +require a journal assigned to them. + +.SH MOUNT OPTIONS + +.TP +\fBlockproto=\fP\fILockProtoName\fR +This specifies which inter-node lock protocol is used by the GFS2 filesystem +for this mount, overriding the default lock protocol name stored in the +filesystem's on-disk superblock. + +The \fILockProtoName\fR must be one of the supported locking protocols, +currently these are \fIlock_nolock\fR and \fIlock_dlm\fR. + +The default lock protocol name is written to disk initially when creating the +filesystem with \fBmkfs.gfs2\fP(8), -p option. It can be changed on-disk by +using the \fBgfs2_tool\fP(8) utility's \fBsb proto\fP command. + +The \fBlockproto\fP mount option should be used only under special +circumstances in which you want to temporarily use a different lock protocol +without changing the on-disk default. Using the incorrect lock protocol +on a cluster filesystem mounted from more than one node will almost +certainly result in filesystem corruption. +.TP +\fBlocktable=\fP\fILockTableName\fR +This specifies the identity of the cluster and of the filesystem for this +mount, overriding the default cluster/filesystem identify stored in the +filesystem's on-disk superblock. The cluster/filesystem name is recognized +globally throughout the cluster, and establishes a unique namespace for +the inter-node locking system, enabling the mounting of multiple GFS2 +filesystems. + +The format of \fILockTableName\fR is lock-module-specific. For +\fIlock_dlm\fR, the format is \fIclustername:fsname\fR. For +\fIlock_nolock\fR, the field is ignored. + +The default cluster/filesystem name is written to disk initially when creating +the filesystem with \fBmkfs.gfs2\fP(8), -t option. It can be changed on-disk +by using the \fBgfs2_tool\fP(8) utility's \fBsb table\fP command. + +The \fBlocktable\fP mount option should be used only under special +circumstances in which you want to mount the filesystem in a different cluster, +or mount it as a different filesystem name, without changing the on-disk +default. +.TP +\fBlocalflocks\fP +This flag tells GFS2 that it is running as a local (not clustered) filesystem, +so it can allow the kernel VFS layer to do all flock and fcntl file locking. +When running in cluster mode, these file locks require inter-node locks, +and require the support of GFS2. When running locally, better performance +is achieved by letting VFS handle the whole job. + +This is turned on automatically by the lock_nolock module. +.TP +\fBerrors=\fP\fI[panic|withdraw]\fR +Setting errors=panic causes GFS2 to oops when encountering an error that +would otherwise cause the +mount to withdraw or print an assertion warning. The default setting +is errors=withdraw. This option should not be used in a production system. +It replaces the earlier \fBdebug\fP option on kernel versions 2.6.31 and +above. +.TP +\fBacl\fP +Enables POSIX Access Control List \fBacl\fP(5) support within GFS2. +.TP +\fBspectator\fP +Mount this filesystem using a special form of read-only mount. The mount +does not use one of the filesystem's journals. The node is unable to +recover journals for other nodes. +.TP +\fBnorecovery\fP +A synonym for spectator +.TP +\fBsuiddir\fP +Sets owner of any newly created file or directory to be that of parent +directory, if parent directory has S_ISUID permission attribute bit set. +Sets S_ISUID in any new directory, if its parent directory's S_ISUID is set. +Strips all execution bits on a new file, if parent directory owner is different +from owner of process creating the file. Set this option only if you know +why you are setting it. +.TP +\fBquota=\fP\fI[off/account/on]\fR +Turns quotas on or off for a filesystem. Setting the quotas to be in +the "account" state causes the per UID/GID usage statistics to be +correctly maintained by the filesystem, limit and warn values are +ignored. The default value is "off". +.TP +\fBdiscard\fP +Causes GFS2 to generate "discard" I/O requests for blocks which have +been freed. These can be used by suitable hardware to implement +thin-provisioning and similar schemes. This feature is supported +in kernel version 2.6.30 and above. +.TP +\fBbarrier\fP +This option, which defaults to on, causes GFS2 to send I/O barriers +when flushing the journal. The option is automatically turned off +if the underlying device does not support I/O barriers. We highly +recommend the use of I/O barriers with GFS2 at all times unless +the block device is designed so that it cannot lose its write cache +content (e.g. its on a UPS, or it doesn't have a write cache) +.TP +\fBcommit=\fP\fIsecs\fR +This is similar to the ext3 \fBcommit=\fP option in that it sets +the maximum number of seconds between journal commits if there is +dirty data in the journal. The default is 60 seconds. This option +is only provided in kernel versions 2.6.31 and above. +.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 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 +consistency guarantee as ordered mode, but it should be slightly +faster for some workloads. The default is ordered mode. +.TP +\fBmeta\fP +This option results in selecting the meta filesystem root rather than +the normal filesystem root. This option is normally only used by +the GFS2 utility functions. Altering any file on the GFS2 meta filesystem +may render the filesystem unusable, so only experts in the GFS2 +on-disk layout should use this option. +.TP +\fBquota_quantum=\fP\fIsecs\fR +This sets the number of seconds for which a change in the quota +information may sit on one node before being written to the quota +file. This is the preferred way to set this parameter. The value +is an integer number of seconds greater than zero. The default is +60 seconds. Shorter settings result in faster updates of the lazy +quota information and less likelihood of someone exceeding their +quota. Longer settings make filesystem operations involving quotas +faster and more efficient. +.TP +\fBstatfs_quantum=\fP\fIsecs\fR +Setting statfs_quantum to 0 is the preferred way to set the slow version +of statfs. The default value is 30 secs which sets the maximum time +period before statfs changes will be syned to the master statfs file. +This can be adjusted to allow for faster, less accurate statfs values +or slower more accurate values. When set to 0, statfs will always +report the true values. +.TP +\fBstatfs_percent=\fP\fIvalue\fR +This setting provides a bound on the maximum percentage change in +the statfs information on a local basis before it is synced back +to the master statfs file, even if the time period has not +expired. If the setting of statfs_quantum is 0, then this setting +is ignored. + +.SH BUGS + +GFS2 doesn't support \fBerrors=\fP\fIremount-ro\fR or \fBdata=\fP\fIjournal\fR. +It is not possible to switch support for user and group quotas on and +off independently of each other. Some of the error messages are rather +cryptic, if you encounter one of these messages check firstly that gfs_controld +is running and secondly that you have enough journals on the filesystem +for the number of nodes in use. + +.SH SEE ALSO + +\fBmount\fP(8) for general mount options, +\fBchmod\fP(1) and \fBchmod\fP(2) for access permission flags, +\fBacl\fP(5) for access control lists, +\fBlvm\fP(8) for volume management, +\fBccs\fP(7) for cluster management, +\fBumount\fP(8), +\fBinitrd\fP(4). + +The GFS2 documentation has been split into a number of sections: + +\fBgfs2_edit\fP(8) A GFS2 debug tool (use with caution) +\fBfsck.gfs2\fP(8) The GFS2 file system checker +\fBgfs2_grow\fP(8) Growing a GFS2 file system +\fBgfs2_jadd\fP(8) Adding a journal to a GFS2 file system +\fBmkfs.gfs2\fP(8) Make a GFS2 file system +\fBgfs2_quota\fP(8) Manipulate GFS2 disk quotas +\fBgfs2_tool\fP(8) Tool to manipulate a GFS2 file system (obsolete) +\fBtunegfs2\fP(8) Tool to manipulate GFS2 superblocks + diff --git a/gfs2/man/gfs2.8 b/gfs2/man/gfs2.8 deleted file mode 100644 index d2b50fc..0000000 --- a/gfs2/man/gfs2.8 +++ /dev/null @@ -1,40 +0,0 @@ -.TH gfs2 8 - -.SH NAME -gfs2 \- GFS2 reference guide - -.SH SYNOPSIS -Overview of manpages and their locations - -.SH DESCRIPTION -The GFS2 documentation has been split into a number of sections. Please -refer to the table below to determine which man page coincides with the -command/feature you are looking for. -.TP 16 -gfs2 -GFS2 overview (this man page) -.TP -mount.gfs2 -Mounting a GFS2 file system -.TP -gfs2_edit -A GFS2 debug tool (use with caution) -.TP -fsck.gfs2 -The GFS2 file system checker -.TP -gfs2_grow -Growing a GFS2 file system -.TP -gfs2_jadd -Adding a journal to a GFS2 file system -.TP -mkfs.gfs2 -Make a GFS2 file system -.TP -gfs2_quota -Manipulate GFS2 disk quotas -.TP -gfs2_tool -Tool to manipulate a GFS2 file system - diff --git a/gfs2/man/mount.gfs2.8 b/gfs2/man/mount.gfs2.8 index 29d14c8..4f0f7b3 100644 --- a/gfs2/man/mount.gfs2.8 +++ b/gfs2/man/mount.gfs2.8 @@ -222,7 +222,7 @@ for the number of nodes in use. .SH SEE ALSO -\fBgfs2\fP(8), +\fBgfs2\fP(5), \fBmount\fP(8) for general mount options, \fBchmod\fP(1) and \fBchmod\fP(2) for access permission flags, \fBacl\fP(5) for access control lists,

13 years, 6 months

1
0
0 / 0

resource-agents: master - resource-agents: tomcat-5 can't start properly

by Marek Grác

Gitweb: http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git... Commit: 364277f52b861f596888f1812f839381ead843f6 Parent: 1ff1ba755ba4b22d050673521fbff6cdc38e0404 Author: Marek 'marx' Grac <mgrac(a)redhat.com> AuthorDate: Mon Sep 27 15:28:19 2010 +0200 Committer: Marek 'marx' Grac <mgrac(a)redhat.com> CommitterDate: Thu Sep 30 13:45:39 2010 +0200 resource-agents: tomcat-5 can't start properly Error was introduced when switching from sudo to su Resolves: rhbz#591003 --- rgmanager/src/resources/tomcat-5.sh | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/rgmanager/src/resources/tomcat-5.sh b/rgmanager/src/resources/tomcat-5.sh index cbdd2e3..a84b450 100644 --- a/rgmanager/src/resources/tomcat-5.sh +++ b/rgmanager/src/resources/tomcat-5.sh @@ -162,12 +162,12 @@ start() CLASSPATH="$JAVA_HOME"/lib/tools.jar:"$CATALINA_HOME"/bin/bootstrap.jar:"$CATALINA_HOME"/bin/commons-logging-api.jar:`/usr/bin/build-classpath mx4j/mx4j-impl`:`/usr/bin/build-classpath mx4j/mx4j-jmx` - su "$TOMCAT_USER" -c "$JAVA_HOME/bin/java" $JAVA_OPTS $OCF_RESKEY_catalina_options \ - -Djava.endorsed.dirs="$JAVA_ENDORSED_DIRS" -classpath "$CLASSPATH" \ - -Dcatalina.base="$TOMCAT_gen_catalina_base" \ - -Dcatalina.home="$CATALINA_HOME" \ - -Djava.io.tmpdir="$CATALINA_TMPDIR" \ - org.apache.catalina.startup.Bootstrap "$@" start \ + su "$TOMCAT_USER" -c " \"$JAVA_HOME/bin/java\" $JAVA_OPTS $OCF_RESKEY_catalina_options \ + -Djava.endorsed.dirs=\"$JAVA_ENDORSED_DIRS\" -classpath \"$CLASSPATH\" \ + -Dcatalina.base=\"$TOMCAT_gen_catalina_base\" \ + -Dcatalina.home=\"$CATALINA_HOME\" \ + -Djava.io.tmpdir=\"$CATALINA_TMPDIR\" \ + org.apache.catalina.startup.Bootstrap \"$@\" start " \ >> "$TOMCAT_gen_catalina_base"/logs/catalina.out 2>&1 &

13 years, 7 months

1
0
0 / 0

cluster: STABLE3 - cman: Calculate expected_votes correctly after leave remove

by Christine Caulfield

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: feb56306ad3cac9357f4b34ac16d905cbac5630d Parent: de0a199f499bec83774ad88765c5e7df487913e9 Author: Christine Caulfield <ccaulfie(a)redhat.com> AuthorDate: Wed Sep 29 12:02:12 2010 +0100 Committer: Christine Caulfield <ccaulfie(a)redhat.com> CommitterDate: Wed Sep 29 12:02:12 2010 +0100 cman: Calculate expected_votes correctly after leave remove When cman_tool leave_remove happens on one node the flag is not cleared so the same thing happens next time the node just runs "leave". We also need to keep the recalculated expected votes in the local storage too, or it gets lost when the node leaves again. Signed-off-by: Christine Caulfield <ccaulfie(a)redhat.com> --- cman/daemon/commands.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/cman/daemon/commands.c b/cman/daemon/commands.c index 7a922dd..d4d9fd9 100644 --- a/cman/daemon/commands.c +++ b/cman/daemon/commands.c @@ -2034,6 +2034,7 @@ static void do_process_transition(int nodeid, char *data) /* Take into account any new expected_votes value that the new node has */ node->expected_votes = msg->expected_votes; + us->expected_votes = max(us->expected_votes, msg->expected_votes); if (old_state != node->state || old_expected != node->expected_votes) recalculate_quorum(0, 0); @@ -2246,6 +2247,7 @@ void add_ais_node(int nodeid, uint64_t incar, int total_members) gettimeofday(&node->join_time, NULL); node->incarnation = incar; node->state = NODESTATE_MEMBER; + node->leave_reason = 0; cluster_members++; recalculate_quorum(0, 0); }

13 years, 7 months

1
0
0 / 0

cluster: STABLE3 - Cman: Handle INT and TERM signals correctly

by Jan Friesse

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: de0a199f499bec83774ad88765c5e7df487913e9 Parent: c09852206f21ed04806211e49ca9423e10fea1f9 Author: Jan Friesse <jfriesse(a)redhat.com> AuthorDate: Mon Sep 27 15:27:59 2010 +0200 Committer: Jan Friesse <jfriesse(a)redhat.com> CommitterDate: Wed Sep 29 12:23:45 2010 +0200 Cman: Handle INT and TERM signals correctly Corosync signal handler (SIGINT and SIGTERM) is replaced by cman one, and this was settting quit_threads to 1. Regular cman shutdown sequence (cman_tool leave) tests if quit_threads is set or not. If so, it refuses continue so it was not possible to cleanly leave cluster. Now SIGINT and SIGTERM are ignored, and (un)intentional kill of corosync is no longer problem. Resolves: rhbz#617234 --- cman/daemon/daemon.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/cman/daemon/daemon.c b/cman/daemon/daemon.c index 64607cc..92cfd47 100644 --- a/cman/daemon/daemon.c +++ b/cman/daemon/daemon.c @@ -489,11 +489,6 @@ int num_listeners(void) return count; } -static void sigint_handler(int ignored) -{ - quit_threads = 1; -} - int cman_init(struct corosync_api_v1 *api) { int fd; @@ -514,12 +509,10 @@ int cman_init(struct corosync_api_v1 *api) return -2; /* Shutdown trap */ - sa.sa_handler = sigint_handler; - sigaction(SIGINT, &sa, NULL); - sigaction(SIGTERM, &sa, NULL); - sa.sa_handler = SIG_IGN; sigaction(SIGPIPE, &sa, NULL); + sigaction(SIGINT, &sa, NULL); + sigaction(SIGTERM, &sa, NULL); return 0; }

13 years, 7 months

1
0
0 / 0

cluster: STABLE3 - Cman: test that corosync is not already running

by Jan Friesse

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: c09852206f21ed04806211e49ca9423e10fea1f9 Parent: e88da89f1a5cdb8eb5e1924514401dfb91c0363c Author: Jan Friesse <jfriesse(a)redhat.com> AuthorDate: Mon Sep 27 15:23:49 2010 +0200 Committer: Jan Friesse <jfriesse(a)redhat.com> CommitterDate: Wed Sep 29 12:23:45 2010 +0200 Cman: test that corosync is not already running Patch fixes init file so now before cman start is tested, if corosync is running. If so, init script will refuse to start. Resolves: rhbz#617234 --- cman/init.d/cman.in | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index 7dae24d..6dfc119 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -521,11 +521,25 @@ stop_configfs() fi } +corosync_running() +{ + [ -f /var/run/corosync.pid ] || return 1 + + read corosync_pid foo < /var/run/corosync.pid + if [ "$(pidof corosync)" == "$corosync_pid" ];then + errmsg="Corosync Cluster Engine is already running" + return 0 + fi + + return 1 +} + start_cman() { check_exec cman_tool || return $? cman_running && return 0 cman_checkconfig || return 1 + corosync_running && return 1 tmpfile=$(mktemp -t cmanstartup.XXXXXXXXXX) if [ -z "$tmpfile" ]; then

13 years, 7 months

1
0
0 / 0

cluster: STABLE3 - Cman: Handle "another instance running" error code

by Jan Friesse

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: e88da89f1a5cdb8eb5e1924514401dfb91c0363c Parent: 2197cb026309d18b864dd2eb10754b095090db40 Author: Jan Friesse <jfriesse(a)redhat.com> AuthorDate: Mon Sep 27 15:22:03 2010 +0200 Committer: Jan Friesse <jfriesse(a)redhat.com> CommitterDate: Wed Sep 29 12:23:45 2010 +0200 Cman: Handle "another instance running" error code Related: rhbz#617247, rhbz#617234 --- cman/cman_tool/join.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/cman/cman_tool/join.c b/cman/cman_tool/join.c index 60460d5..caa5bf6 100644 --- a/cman/cman_tool/join.c +++ b/cman/cman_tool/join.c @@ -85,6 +85,12 @@ static const char *corosync_exit_reason(signed char status) case 16: return "Required directory not present /var/lib/corosync."; break; + case 17: + return "Could not acquire lock"; + break; + case 18: + return "Another Corosync instance is already running"; + break; default: sprintf(reason, "Error, reason code is %d", status); return reason;

13 years, 7 months

1
0
0 / 0

cluster: STABLE3 - Cman: Handle corosync exit codes

by Jan Friesse

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: 2197cb026309d18b864dd2eb10754b095090db40 Parent: c0259b307aa771dd6848bc6eaf4b1ad98b657d31 Author: Jan Friesse <jfriesse(a)redhat.com> AuthorDate: Mon Sep 27 15:20:16 2010 +0200 Committer: Jan Friesse <jfriesse(a)redhat.com> CommitterDate: Wed Sep 29 12:23:45 2010 +0200 Cman: Handle corosync exit codes Resolves: rhbz#617247 --- cman/cman_tool/join.c | 32 +++++++++++++++++++------------- 1 files changed, 19 insertions(+), 13 deletions(-) diff --git a/cman/cman_tool/join.c b/cman/cman_tool/join.c index 308d19b..60460d5 100644 --- a/cman/cman_tool/join.c +++ b/cman/cman_tool/join.c @@ -40,45 +40,51 @@ static const char *corosync_exit_reason(signed char status) { static char reason[256]; switch (status) { - case -2: + case 1: return "Could not determine UID to run as"; break; - case -3: + case 2: return "Could not determine GID to run as"; break; - case -4: + case 3: return "Error initialising memory pool"; break; - case -5: + case 4: return "Could not fork"; break; - case -6: + case 5: return "Could not bind to libais socket"; break; - case -7: + case 6: return "Could not bind to network socket"; break; - case -8: + case 7: return "Could not read security key for communications"; break; - case -9: + case 8: return "Could not read cluster configuration"; break; - case -10: + case 9: return "Could not set up logging"; break; - case -11: + case 11: return "Could not dynamically load modules"; break; - case -12: + case 12: return "Could not load and initialise object database"; break; - case -13: + case 13: return "Could not initialise all required services"; break; - case -14: + case 14: return "Out of memory"; break; + case 15: + return "Fatal error"; + break; + case 16: + return "Required directory not present /var/lib/corosync."; + break; default: sprintf(reason, "Error, reason code is %d", status); return reason;

13 years, 7 months

1
0
0 / 0

cluster: STABLE3 - cman init: fix "stop remove" operation

by Fabio M. Di Nitto

Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=... Commit: c0259b307aa771dd6848bc6eaf4b1ad98b657d31 Parent: cd0d5b10e6ad4f04c0fd0adb440d9ccf0380426f Author: Fabio M. Di Nitto <fdinitto(a)redhat.com> AuthorDate: Tue Sep 28 13:15:24 2010 +0200 Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com> CommitterDate: Tue Sep 28 13:15:24 2010 +0200 cman init: fix "stop remove" operation re-instate support for stop remove that was erroneusly dropped Resolves: rhbz#634718 Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com> --- cman/init.d/cman.in | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index 06703f4..7dae24d 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -940,6 +940,9 @@ start) ;; stop) cmanremove="" + if [ -n "$2" ] && [ "$2" = "remove" ]; then + cmanremove=remove + fi stop && rm -f $LOCK_FILE if [ "$INITLOGLEVEL" = "quiet" ]; then success

13 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

cluster-commits September 2010