resource-agents: master - drop reference to obsolted tool
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/resource-agents.git?p=resource-agents.git...
Commit: 6224f31169ff1a881993f84bbada7bf8572371f9
Parent: 1ae6f5cc3a628ffeb7cd2bf61178f858196703a3
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Thu Jul 9 08:47:40 2009 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Thu Jul 9 08:47:40 2009 +0200
drop reference to obsolted tool
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
rgmanager/src/resources/nfsexport.sh | 7 -------
1 files changed, 0 insertions(+), 7 deletions(-)
diff --git a/rgmanager/src/resources/nfsexport.sh b/rgmanager/src/resources/nfsexport.sh
index cd5bfdf..b013a5e 100644
--- a/rgmanager/src/resources/nfsexport.sh
+++ b/rgmanager/src/resources/nfsexport.sh
@@ -235,11 +235,4 @@ validate-all)
;;
esac
-#
-# Flush NFS request queue. This might be done in the ip resource in the
-# future, but keep this around for now.
-#
-# clunfsops $nfsop_arg -d ${OCF_RESKEY_device}
-#
-
exit $rv
14 years, 8 months
cluster: STABLE3 - oracledb ras: stop using obsoleted initlog
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 18100b8bcc49b84a7eb9ad8b36237ab83d628300
Parent: 3dcc10f537594ef711d7e72d43256755bdae9cc1
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Thu Oct 22 07:26:25 2009 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Thu Oct 22 07:26:25 2009 +0200
oracledb ras: stop using obsoleted initlog
replace with logger.
Thanks to Bill Nottingham for the patch.
Fixes rhbz#530197
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
rgmanager/src/resources/oracledb.sh.in | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/rgmanager/src/resources/oracledb.sh.in b/rgmanager/src/resources/oracledb.sh.in
index 809605e..5ba3370 100644
--- a/rgmanager/src/resources/oracledb.sh.in
+++ b/rgmanager/src/resources/oracledb.sh.in
@@ -278,7 +278,7 @@ start_db()
rm -f $tmpfile
# Dump logfile to /var/log/messages
- initlog -q -c "cat $logfile"
+ logger -f $logfile
if [ $rv -ne 0 ]; then
echo "ORACLE_HOME Incorrectly set?"
@@ -326,7 +326,7 @@ stop_db()
rm -f $tmpfile
# Dump logfile to /var/log/messages
- initlog -q -c "cat $logfile"
+ logger -f $logfile
if [ $rv -ne 0 ]; then
echo "ORACLE_HOME Incorrectly set?"
@@ -362,12 +362,12 @@ force_cleanup()
# Patch from Shane Bradley to fix 471266
pids=`ps ax | grep $ORACLE_HOME | grep "ora_.*_${ORACLE_SID}" | grep -v grep | awk '{print $1}'`
- initlog -n $SCRIPT -s "<err> Not all Oracle processes exited cleanly, killing"
+ logger -t $SCRIPT "<err> Not all Oracle processes exited cleanly, killing"
for pid in $pids; do
kill -9 $pid
if [ $? -eq 0 ]; then
- initlog -n $SCRIPT -s "Killed $pid"
+ logger -t $SCRIPT "Killed $pid"
fi
done
@@ -428,7 +428,7 @@ get_db_status()
for (( i=$RESTART_RETRIES ; i; i-- )) ; do
# this db process is down - stop and
# (re)start all ora_XXXX_$ORACLE_SID processes
- initlog -q -n $SCRIPT -s "Restarting Oracle Database..."
+ logger -t $SCRIPT "Restarting Oracle Database..."
stop_db
if [ $? != 0 ] ; then
# stop failed - return 1
14 years, 8 months
cluster: RHEL55 - rgmanager: Fix bad assertion
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 25155283f4797f85fa30b95c94c8ebb7df07dcc3
Parent: 5c328396a61fd828c939fa3eea25b763093d0ba1
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Wed Oct 21 15:42:10 2009 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Wed Oct 21 15:45:03 2009 -0400
rgmanager: Fix bad assertion
rhbz#506094
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
rgmanager/src/daemons/restree.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c
index d93921b..900debe 100644
--- a/rgmanager/src/daemons/restree.c
+++ b/rgmanager/src/daemons/restree.c
@@ -1431,8 +1431,9 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree,
incarnations there are. */
pthread_mutex_lock(&node->rn_resource->r_mutex);
if (node->rn_state == RES_STARTED) {
- assert(node->rn_resource->r_incarnations > 0);
- --node->rn_resource->r_incarnations;
+ assert(node->rn_resource->r_incarnations >= 0);
+ if (node->rn_resource->r_incarnations > 0)
+ --node->rn_resource->r_incarnations;
}
node->rn_flags &= ~RF_NEEDSTOP;
14 years, 8 months
cluster: STABLE3 - rgmanager: Fix bad assertion
by Lon Hohberger
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 3dcc10f537594ef711d7e72d43256755bdae9cc1
Parent: eeac060d98895dff7a87a372f9d6e24f0b5dee67
Author: Lon Hohberger <lhh(a)redhat.com>
AuthorDate: Wed Oct 21 15:42:10 2009 -0400
Committer: Lon Hohberger <lhh(a)redhat.com>
CommitterDate: Wed Oct 21 15:42:10 2009 -0400
rgmanager: Fix bad assertion
Signed-off-by: Lon Hohberger <lhh(a)redhat.com>
---
rgmanager/src/daemons/restree.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/rgmanager/src/daemons/restree.c b/rgmanager/src/daemons/restree.c
index 4ae0848..a4d2926 100644
--- a/rgmanager/src/daemons/restree.c
+++ b/rgmanager/src/daemons/restree.c
@@ -1376,8 +1376,9 @@ _res_op_internal(resource_node_t __attribute__ ((unused)) **tree,
incarnations there are. */
pthread_mutex_lock(&node->rn_resource->r_mutex);
if (node->rn_state == RES_STARTED) {
- assert(node->rn_resource->r_incarnations > 0);
- --node->rn_resource->r_incarnations;
+ assert(node->rn_resource->r_incarnations >= 0);
+ if (node->rn_resource->r_incarnations > 0)
+ --node->rn_resource->r_incarnations;
}
node->rn_flags &= ~RF_NEEDSTOP;
14 years, 8 months
cluster: the annotated tag cluster-3.0.4 has been created
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: e95b0dec067428e7f79251eff23e162dbe9fe6b3
Parent: 0000000000000000000000000000000000000000
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: 2009-10-21 11:04 +0000
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: 2009-10-21 11:04 +0000
annotated tag: cluster-3.0.4 has been created
at e95b0dec067428e7f79251eff23e162dbe9fe6b3 (tag)
tagging eeac060d98895dff7a87a372f9d6e24f0b5dee67 (commit)
replaces cluster-3.0.3
cluster-3.0.4 release
Bob Peterson (2):
gfs_fsck -n always returns 0 even if error is found
GFS: New mount option: -o errors=withdraw|panic
Christine Caulfield (9):
cman: Add a validation step to cman_tool join & version subcommands
cman: propogate all COROSYNC_* varaibles to validation program.
cman: Disable "Disallowed" mode by default.
cman: Allow <cman upgrading="yes"/>
cman: Fix join fail message
config: add cman upgrading and disallowed keys to the schema
config: fix LDAP loader
cman: Fix cman_tool join again
cman: make quorum_dev_poll default to totem.token
David Teigland (7):
dlm_controld: fix set_fs_notified when ls doesn't exist
fenced: fix reported fence time
libfence: add nodename to agent args
libfence: add nodename to agent args (for unfence)
libfence: increase FENCE_AGENT_ARGS_MAX to 4096
libfence: replace strcat
gfs_controld: watch cluster membership
Eduardo Damato (3):
qdisk: Implement I/O timeouts in qdiskd
qdisk: Disable max_error_cycles when using io_timeout
qdisk: Implement I/O timeout for read
Fabio M. Di Nitto (14):
cman_tool: fix Makefile
config validation: add quiet option and allow env override
cman init: add options to drive config validation in cman_tool
cman_tool: use quiet options for config validation
cman init: fix set_networking_params
cman init: fix another set_networking_params check
fence agents automatic man page generation
fence_ilo: do not import unrequired modules
fence_ipmilan: allow metadata invocation without other parameters
fence_sandbox2: add short and long description for man page generation
fix generation date in xsl file
fencing: drop all static man pages that are now generated dynamically
cman init: fix debugging vs relax ng output at startup
qdiskd: fix () so that it actually works again
Flavio Leitner (1):
rgmanager: Simplify bonded link checking
Jan Friesse (2):
fence_vmware: VIX API fix, ESX 4.0.0, helper more verbose
fencing_snmp: Fix exception caused by older commit
Lon Hohberger (6):
rgmanager: Fix -m and -s output when fed bad data
rgmanager: Fix clusvcadm help output
rgmanager: Fix multiple event processing w/ EVENT_USER
cman: Move token timeout into header file
fence_xvmd: Allow interface assignment in cluster.conf
rgmanager: Remove async migration semantics
Marc Milgram (1):
rgmanager: Fix path evaluation during force unmount
Marek 'marx' Grac (16):
[rgmanager] Rgmanager uses sudo to start/manage tomcat5 service which fails as no tty is available
fence_scsi: man page contains invalid "-s" option
fence_sanbox2: Re-implemenatition based on fencing library
fence_sanbox2: Support operation 'list' for sanbox2
fence_sanbox2: Typo correction
fencing: Timeout options added
fencing: Accept unknown options from standard input
fence_rackswitch: Accept unknown options without value
fencing: Correct exit codes for status operation
fencing: New option '--missing-as-off' to return OFF is machine is missing
fence_ipmilan: metadata should be in expected format
fencing: Typo meta-data -> metadata
fence_xvm: metadata should be in expected format
fencing: fix fence_a, fence_l, ...
fencing: short description of fence agent added
fencing: long description added
Steven Whitehouse (3):
gfs: Fix build warnings due to print formats
gfs: Use GFP_NOFS in a few places to be safe
gfs: Update uevents to match gfs2
14 years, 8 months
cluster: master - qdiskd: fix () so that it actually works again
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: 81d3d6a20cf95bb3da64b66fe56ac52ae521d6ae
Parent: f3eaf86591ef2fd9f2bede06f4277b10614ea508
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Oct 21 12:55:15 2009 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Wed Oct 21 13:00:36 2009 +0200
qdiskd: fix () so that it actually works again
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/qdisk/main.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index f522ebd..e07e76c 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -942,9 +942,9 @@ quorum_loop(qd_ctx *ctx, node_info_t *ni, int max)
/* XXX this was getuptime() in clumanager */
get_time(&oldtime, (ctx->qc_flags&RF_UPTIME));
-
+
/* Read everyone else's status */
- if ( (errors = read_node_blocks(ctx, ni, max) == 0 ))
+ if ((errors = read_node_blocks(ctx, ni, max)) == 0 )
get_time(&rd_lastok, ctx->qc_flags&RF_UPTIME);
/* Check for node transitions */
14 years, 8 months
cluster: STABLE3 - qdiskd: fix () so that it actually works again
by Fabio M. Di Nitto
Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=...
Commit: eeac060d98895dff7a87a372f9d6e24f0b5dee67
Parent: b7205d27c126a4e12aab19026a433a1bafd19f7c
Author: Fabio M. Di Nitto <fdinitto(a)redhat.com>
AuthorDate: Wed Oct 21 12:55:15 2009 +0200
Committer: Fabio M. Di Nitto <fdinitto(a)redhat.com>
CommitterDate: Wed Oct 21 12:55:15 2009 +0200
qdiskd: fix () so that it actually works again
Signed-off-by: Fabio M. Di Nitto <fdinitto(a)redhat.com>
---
cman/qdisk/main.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/cman/qdisk/main.c b/cman/qdisk/main.c
index 32740de..87934c9 100644
--- a/cman/qdisk/main.c
+++ b/cman/qdisk/main.c
@@ -939,9 +939,9 @@ quorum_loop(qd_ctx *ctx, node_info_t *ni, int max)
/* XXX this was getuptime() in clumanager */
get_time(&oldtime, (ctx->qc_flags&RF_UPTIME));
-
+
/* Read everyone else's status */
- if ( (errors = read_node_blocks(ctx, ni, max) == 0 ))
+ if ((errors = read_node_blocks(ctx, ni, max)) == 0 )
get_time(&rd_lastok, ctx->qc_flags&RF_UPTIME);
/* Check for node transitions */
14 years, 8 months