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: heartbeat 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: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
4. Linux-HA CVS: crm by andrew from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Thu, 27 Jul 2006 03:17:58 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: heartbeat by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : heartbeat
Dir : linux-ha/heartbeat
Modified Files:
config.c
Log Message:
Change the default api-auth for pingd to uid=root
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat/config.c,v
retrieving revision 1.203
retrieving revision 1.204
diff -u -3 -r1.203 -r1.204
--- config.c 13 Jul 2006 16:23:55 -0000 1.203
+++ config.c 27 Jul 2006 09:17:56 -0000 1.204
@@ -1,4 +1,4 @@
-/* $Id: config.c,v 1.203 2006/07/13 16:23:55 alan Exp $ */
+/* $Id: config.c,v 1.204 2006/07/27 09:17:56 andrew Exp $ */
/*
* Parse various heartbeat configuration files...
*
@@ -2519,7 +2519,7 @@
#ifdef MGMT_ENABLED
, {"apiauth", "mgmtd uid=root" }
#endif
- , {"apiauth", "pingd uid=" HA_CCMUSER}
+ , {"apiauth", "pingd uid=root"}
, {"respawn", " "HA_CCMUSER " " HALIB "/ccm"}
, {"respawn", " "HA_CCMUSER " " HALIB "/cib"}
@@ -2664,6 +2664,9 @@
/*
* $Log: config.c,v $
+ * Revision 1.204 2006/07/27 09:17:56 andrew
+ * Change the default api-auth for pingd to uid=root
+ *
* Revision 1.203 2006/07/13 16:23:55 alan
* Patch from Serge Dubrouski for not starting any optional components.
*
------------------------------
Message: 2
Date: Thu, 27 Jul 2006 03:19:37 -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:
Dummy.in
Log Message:
Make the Dummy RA conform to at least some of the OCF standard.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/resources/OCF/Dummy.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- Dummy.in 10 Mar 2006 04:14:20 -0000 1.4
+++ Dummy.in 27 Jul 2006 09:19:36 -0000 1.5
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $Id: Dummy.in,v 1.4 2006/03/10 04:14:20 xunsun Exp $
+# $Id: Dummy.in,v 1.5 2006/07/27 09:19:36 andrew Exp $
#
# Dummy OCF RA. Does nothing but wait a few seconds, can be
# configured to fail occassionally.
@@ -100,41 +100,58 @@
if [ -e /tmp/Dummy.$__OCF_ACTION ]; then
exit $OCF_ERR_GENERIC
else
- exit $OCF_SUCCESS
+ exit $1
fi
}
dummy_start() {
sleep $OCF_RESKEY_start_delay
+ if [ -f ${OCF_RESKEY_state} ]; then
+ return 0
+ fi
+ touch ${OCF_RESKEY_state}
}
dummy_stop() {
sleep $OCF_RESKEY_stop_delay
+ if [ -f ${OCF_RESKEY_state} ]; then
+ rm ${OCF_RESKEY_state}
+ fi
+ return 0
}
dummy_monitor() {
sleep $OCF_RESKEY_monitor_delay
+ if [ -f ${OCF_RESKEY_state} ]; then
+ return 0
+ fi
+ return 7
}
dummy_validate() {
exit $OC_ERR_UNIMPLEMENTED
}
+: ${OCF_RESKEY_start_delay=10}
+: ${OCF_RESKEY_stop_delay=$OCF_RESKEY_start_delay}
+: ${OCF_RESKEY_monitor_delay=$OCF_RESKEY_start_delay}
+: [EMAIL PROTECTED]@/run/@HB_PKG@/rsctmp/Dummy-${OCF_RESOURCE_INSTANCE}.state}
+
case $__OCF_ACTION in
meta-data) meta_data
exit $OCF_SUCCESS
;;
start) dummy_start
- dummy_exit
+ dummy_exit $?
;;
stop) dummy_stop
- dummy_exit
+ dummy_exit $?
;;
monitor) dummy_monitor
- dummy_exit
+ dummy_exit $?
;;
validate-all) dummy_validate
- dummy_exit
+ dummy_exit $?
;;
usage|help) dummy_usage
exit $OCF_SUCCESS
------------------------------
Message: 3
Date: Thu, 27 Jul 2006 03:26:15 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/crmd
Modified Files:
lrm.c
Log Message:
Send filtered resource "stops" as successes
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -3 -r1.202 -r1.203
--- lrm.c 18 Jul 2006 06:17:32 -0000 1.202
+++ lrm.c 27 Jul 2006 09:26:14 -0000 1.203
@@ -907,6 +907,8 @@
crm_log_xml_warn(input->xml, "Bad command");
op = construct_op(input->xml, ID(xml_rsc), operation);
+ op->op_status = LRM_OP_DONE;
+ op->rc = 0;
CRM_ASSERT(op != NULL);
send_direct_ack(from_host, from_sys, op, ID(xml_rsc));
free_lrm_op(op);
------------------------------
Message: 4
Date: Thu, 27 Jul 2006 04:01:16 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine
Modified Files:
native.c regression.sh
Log Message:
STONITH events need to inputs to start events (not stops)
Making them inputs to stops leaves us open to graph loops when resources
with "stop before" ordering dependancies fail (ie. groups)
Graph loops prevent us from making progress
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/native.c,v
retrieving revision 1.158
retrieving revision 1.159
diff -u -3 -r1.158 -r1.159
--- native.c 18 Jul 2006 06:19:33 -0000 1.158
+++ native.c 27 Jul 2006 10:01:15 -0000 1.159
@@ -1,4 +1,4 @@
-/* $Id: native.c,v 1.158 2006/07/18 06:19:33 andrew Exp $ */
+/* $Id: native.c,v 1.159 2006/07/27 10:01:15 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1826,17 +1826,11 @@
if(is_stonith) {
/* do nothing */
- } else if(action->optional) {
- /* does this case ever happen? */
+ } else {
custom_action_order(
NULL,
crm_strdup(CRM_OP_FENCE),stonith_op,
rsc, start_key(rsc), NULL,
pe_ordering_manditory, data_set);
- } else {
- custom_action_order(
- NULL,
crm_strdup(CRM_OP_FENCE),stonith_op,
- rsc, NULL, action,
- pe_ordering_manditory, data_set);
}
/* find the top-most resource */
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/regression.sh,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -3 -r1.92 -r1.93
--- regression.sh 13 Jul 2006 10:20:12 -0000 1.92
+++ regression.sh 27 Jul 2006 10:01:15 -0000 1.93
@@ -204,17 +204,18 @@
echo ""
-do_test 594 "Bugzilla 594"
-do_test 662 "Bugzilla 662"
-do_test 696 "Bugzilla 696"
-do_test 726 "Bugzilla 726"
-do_test 735 "Bugzilla 735"
-do_test 764 "Bugzilla 764"
-do_test 797 "Bugzilla 797"
-do_test 829 "Bugzilla 829"
-do_test 994 "Bugzilla 994"
+do_test 594 "OSDL #594"
+do_test 662 "OSDL #662"
+do_test 696 "OSDL #696"
+do_test 726 "OSDL #726"
+do_test 735 "OSDL #735"
+do_test 764 "OSDL #764"
+do_test 797 "OSDL #797"
+do_test 829 "OSDL #829"
+do_test 994 "OSDL #994"
do_test 1360 "OSDL #1360 - Clone stickiness"
do_test unrunnable-1 "Unrunnable"
+do_test stonith-0 "Stonith loop"
echo ""
------------------------------
_______________________________________________
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 32, Issue 67
********************************************
