Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: tools by andrew from
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: resources by andrew from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: lib by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: resources by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Mon, 14 Aug 2006 03:38:21 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: tools by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : tools
Dir : linux-ha/tools
Modified Files:
ocf-tester
Log Message:
Tweaks to the OCF tester
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/tools/ocf-tester,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- ocf-tester 14 Aug 2006 09:14:13 -0000 1.1
+++ ocf-tester 14 Aug 2006 09:38:20 -0000 1.2
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# $Id: ocf-tester,v 1.1 2006/08/14 09:14:13 andrew Exp $
+# $Id: ocf-tester,v 1.2 2006/08/14 09:38:20 andrew Exp $
#
# pingd OCF RA. Does nothing but wait a few seconds, can be
# configured to fail occassionally.
@@ -42,7 +42,7 @@
exit_code=$1; shift
if [ $rc != $target ]; then
num_errors=`expr $num_errors + 1`
- echo -e " * rc=$rc: $msg"
+ echo -e "* rc=$rc: $msg"
if [ ! -z $exit_code ]; then
echo "Aborting tests"
exit $exit_code
@@ -52,11 +52,13 @@
done=0
ra_args=""
+verbose=0
while test "$done" = "0"; do
case "$1" in
-n) ra_args="$ra_args OCF_RESOURCE_INSTANCE=$2"; shift; shift;;
-o) name=${2%%=*}; value=${2##*=};
ra_args="$ra_args OCF_RESKEY_$name=$value"; shift; shift;;
+ -v) verbose=1; shift;;
-?) usage 0;;
-*) echo "unknown option: $1"; usage 1;;
*) done=1;;
@@ -77,7 +79,11 @@
#echo $msg
#echo Running: "export $ra_args; bash $agent $action 2>&1 > /dev/null"
export $ra_args;
- bash $agent $action >/dev/null 2>&1
+ if [ $verbose = 0 ]; then
+ bash $agent $action >/dev/null 2>&1
+ else
+ bash $agent $action
+ fi
rc=$?
#echo rc: $rc
return $rc
@@ -86,6 +92,10 @@
# Begin tests
echo Beginning tests for $agent...
+if [ ! -f $agent ]; then
+ assert 7 0 "Could not find file: $agent"
+fi
+
test_command meta-data
rc=$?
if [ $rc = 3 ]; then
@@ -136,7 +146,7 @@
test_command notify
rc=$?
if [ $rc = 3 ]; then
- echo " * Your agent does not support the notify action (optional)"
+ echo "* Your agent does not support the notify action (optional)"
else
assert $? 0 "The notify action cannot fail and must return 0"
fi
@@ -144,13 +154,13 @@
test_command demote "Checking for demote action"
if [ $? = 3 ]; then
has_demote=0
- echo " * Your agent does not support the demote action (optional)"
+ echo "* Your agent does not support the demote action (optional)"
fi
test_command promote "Checking for promote action"
if [ $? = 3 ]; then
has_promote=0
- echo " * Your agent does not support the promote action (optional)"
+ echo "* Your agent does not support the promote action (optional)"
fi
if [ $has_promote = 1 -a $has_demote = 1 ]; then
@@ -176,10 +186,10 @@
assert $? 0 "Demote failed" 1
elif [ $has_promote = 0 -a $has_demote = 0 ]; then
- echo " * Your agent does not support master/slave (optional)"
+ echo "* Your agent does not support master/slave (optional)"
else
- echo " * Your agent partially supports master/slave"
+ echo "* Your agent partially supports master/slave"
num_errors=`expr $num_errors + 1`
fi
------------------------------
Message: 2
Date: Mon, 14 Aug 2006 03:39:06 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Modified Files:
ocf-shellfuncs.in
Log Message:
This is set for all heartbeat RAs... so it seems that its required and
it would make sense to set it centrally
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/ocf-shellfuncs.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- ocf-shellfuncs.in 22 May 2006 11:03:41 -0000 1.31
+++ ocf-shellfuncs.in 14 Aug 2006 09:39:06 -0000 1.32
@@ -1,5 +1,5 @@
#
-# $Id: ocf-shellfuncs.in,v 1.31 2006/05/22 11:03:41 andrew Exp $
+# $Id: ocf-shellfuncs.in,v 1.32 2006/08/14 09:39:06 andrew Exp $
#
# Common helper functions for the OCF Resource Agents supplied by
# heartbeat.
@@ -36,6 +36,11 @@
# prefixes
# TODO: Move more common functionality for OCF RAs here.
#
+
+# This was common throughout all legacy Heartbeat agents
+unset LC_ALL; export LC_ALL
+unset LANGUAGE; export LANGUAGE
+
[EMAIL PROTECTED]@/ha.d
__SCRIPT_NAME=`basename $0`
. ${HA_D}/shellfuncs
------------------------------
Message: 3
Date: Mon, 14 Aug 2006 03:40:02 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/pengine
Modified Files:
unpack.c
Log Message:
Correctly process the "dont fence unseen nodes" option
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/pengine/unpack.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- unpack.c 14 Aug 2006 09:14:45 -0000 1.17
+++ unpack.c 14 Aug 2006 09:40:01 -0000 1.18
@@ -1,4 +1,4 @@
-/* $Id: unpack.c,v 1.17 2006/08/14 09:14:45 andrew Exp $ */
+/* $Id: unpack.c,v 1.18 2006/08/14 09:40:01 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -160,8 +160,14 @@
const char *id = NULL;
const char *uname = NULL;
const char *type = NULL;
+ gboolean unseen_are_unclean = TRUE;
const char *blind_faith = pe_pref(
data_set->config_hash, "startup-fencing");
+
+ if(crm_is_true(blind_faith) == FALSE) {
+ unseen_are_unclean = FALSE;
+ crm_warn("Blind faith: not fencing unseen nodes");
+ }
crm_debug_2("Begining unpack... %s",
xml_nodes?crm_element_name(xml_nodes):"<none>");
@@ -215,7 +221,7 @@
/* new_node->weight = -INFINITY; */
/* } */
- if(data_set->stonith_enabled == FALSE ||
crm_is_true(blind_faith)) {
+ if(data_set->stonith_enabled == FALSE || unseen_are_unclean ==
FALSE) {
/* blind faith... */
new_node->details->unclean = FALSE;
------------------------------
Message: 4
Date: Mon, 14 Aug 2006 06:57:30 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: resources by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : resources
Dir : linux-ha/resources/OCF
Added Files:
Stateful.in
Log Message:
Replacement stateful resource agent that is suitable to be used as a template
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 33, Issue 26
********************************************
