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: cts by alan from (linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: linux-ha by alan from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Mon, 10 Jul 2006 19:36:37 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : cts
Dir : linux-ha/cts
Modified Files:
CIB.py.in
Log Message:
Upped some test timeouts (again)
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CIB.py.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- CIB.py.in 23 Jun 2006 08:34:09 -0000 1.16
+++ CIB.py.in 11 Jul 2006 01:36:37 -0000 1.17
@@ -36,8 +36,8 @@
dc_ipaddr_resource_template = '''
<primitive id="DcIPaddr" class="ocf" type="IPaddr"
provider="heartbeat" is_managed="1">
<operations>
- <op id="DcIPaddr-1" name="monitor" interval="5s" timeout="20s"/>
- <op id="DcIPaddr-2" name="start" timeout="40s"/>
+ <op id="DcIPaddr-1" name="monitor" interval="5s" timeout="45s"/>
+ <op id="DcIPaddr-2" name="start" timeout="45s"/>
</operations>
<instance_attributes id="DcIPaddr">
<attributes>
@@ -49,8 +49,8 @@
clustermon_resource_template = '''
<primitive id="cluster_mon" class="ocf" type="ClusterMon"
provider="heartbeat" is_managed="1">
<operations>
- <op id="cluster_mon-1" name="monitor" interval="5s" timeout="20s"
prereq="nothing"/>
- <op id="cluster_mon-2" name="start" timeout="20s"
prereq="nothing"/>
+ <op id="cluster_mon-1" name="monitor" interval="5s" timeout="45s"
prereq="nothing"/>
+ <op id="cluster_mon-2" name="start" timeout="45s"
prereq="nothing"/>
</operations>
<instance_attributes id="ClusterMon">
<attributes>
@@ -79,7 +79,7 @@
lsb_resource = '''
<primitive id="lsb_dummy" class="lsb"
type="@libdir@/heartbeat/cts/LSBDummy" provider="heartbeat">
<operations>
- <op id="ocf_lsb_monitor" name="monitor" interval="5s"
timeout="20s"/>
+ <op id="ocf_lsb_monitor" name="monitor" interval="5s"
timeout="45s"/>
</operations>
</primitive> '''
@@ -95,8 +95,8 @@
</instance_attributes>
<primitive id="ocf_msdummy" class="ocf"
type="@libdir@/heartbeat/cts/OCFMSDummy" provider="heartbeat">
<operations>
- <op id="ocf_msdummy_monitor" name="monitor" interval="5s"
timeout="10s"/>
- <op id="ocf_msdummy_monitor_master" name="monitor" interval="6s"
timeout="10s" role="Master"/>
+ <op id="ocf_msdummy_monitor" name="monitor" interval="5s"
timeout="60s"/>
+ <op id="ocf_msdummy_monitor_master" name="monitor" interval="6s"
timeout="60s" role="Master"/>
</operations>
<instance_attributes id="master-child">
<attributes>
@@ -110,7 +110,7 @@
<group id="group-1">
<primitive id="ocf_%s" class="ocf" type="IPaddr"
provider="heartbeat">
<operations>
- <op id="ocf_chil%s_monitor" name="monitor" interval="5s"
timeout="20s"/>
+ <op id="ocf_chil%s_monitor" name="monitor" interval="5s"
timeout="45s"/>
</operations>
<instance_attributes id="ip-1">
<attributes>
@@ -120,7 +120,7 @@
</primitive>
<primitive id="heartbeat_%s" class="heartbeat" type="IPaddr"
provider="heartbeat">
<operations>
- <op id="heartbeat_%s_monitor" name="monitor" interval="5s"
timeout="20s"/>
+ <op id="heartbeat_%s_monitor" name="monitor" interval="5s"
timeout="45s"/>
</operations>
<instance_attributes id="ip-2">
<attributes>
@@ -130,7 +130,7 @@
</primitive>
<primitive id="ocf_%s" class="ocf" type="IPaddr"
provider="heartbeat">
<operations>
- <op id="ocf_%s_monitor" name="monitor" interval="5s"
timeout="20s"/>
+ <op id="ocf_%s_monitor" name="monitor" interval="5s"
timeout="45s"/>
</operations>
<instance_attributes id="ip-3">
<attributes>
@@ -144,8 +144,8 @@
per_node_resource_template = '''
<primitive id="%s" class="ocf" type="IPaddr" provider="heartbeat"
is_managed="1">
<operations>
- <op id="%s-1" name="monitor" interval="5s" timeout="20s"/>
- <op id="%s-2" name="start" timeout="40s"/>
+ <op id="%s-1" name="monitor" interval="5s" timeout="45s"/>
+ <op id="%s-2" name="start" timeout="45s"/>
</operations>
<instance_attributes id="%s">
<attributes>
@@ -171,8 +171,8 @@
</instance_attributes>
<primitive id="child_DoFencing" class="stonith" type="ssh">
<operations>
- <op id="DoFencing-1" name="monitor" interval="20s" timeout="40s"
prereq="nothing"/>
- <op id="DoFencing-2" name="start" timeout="20s"
prereq="nothing"/>
+ <op id="DoFencing-1" name="monitor" interval="20s" timeout="45s"
prereq="nothing"/>
+ <op id="DoFencing-2" name="start" timeout="45s"
prereq="nothing"/>
</operations>
<instance_attributes id="fencing-child">
<attributes>
------------------------------
Message: 2
Date: Mon, 10 Jul 2006 21:55:50 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
heartbeat.spec.in
Log Message:
Got rid of the automatic enablement of heartbeat in the RPM install process.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -3 -r1.185 -r1.186
--- heartbeat.spec.in 10 Jul 2006 14:20:43 -0000 1.185
+++ heartbeat.spec.in 11 Jul 2006 03:55:49 -0000 1.186
@@ -1,4 +1,4 @@
-# $Id: heartbeat.spec.in,v 1.185 2006/07/10 14:20:43 davidlee Exp $
+# $Id: heartbeat.spec.in,v 1.186 2006/07/11 03:55:49 alan Exp $
%define _unpackaged_files_terminate_build 1
%define _missing_doc_files_terminate_build 1
@@ -1356,8 +1356,10 @@
%post
###########################################################
-# Enable heartbeat on startup
-/sbin/chkconfig --add heartbeat
+# Don't enable heartbeat on startup
+#/sbin/chkconfig --add heartbeat
+# this was wrong, but it was convenient. The time has
+# come to fix it.
true
###########################################################
------------------------------
_______________________________________________
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 40
********************************************
