Send Linux-ha-cvs mailing list submissions to
[email protected]
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: linux-ha by andrew from
([email protected])
2. Linux-HA CVS: crm by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Mon, 10 Apr 2006 08:54:46 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
RA for driving pingd. Probably broken.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.501
retrieving revision 1.502
diff -u -3 -r1.501 -r1.502
--- configure.in 10 Apr 2006 09:11:05 -0000 1.501
+++ configure.in 10 Apr 2006 14:54:46 -0000 1.502
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.501 $) dnl cvs revision
+AC_REVISION($Revision: 1.502 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -2646,6 +2646,7 @@
resources/OCF/ocf-shellfuncs \
resources/OCF/ClusterMon \
resources/OCF/Dummy \
+ resources/OCF/pingd \
resources/OCF/apache \
resources/OCF/AudibleAlarm \
resources/OCF/Delay \
------------------------------
Message: 2
Date: Mon, 10 Apr 2006 09:07:20 -0600 (MDT)
From: [email protected]
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:
control.c
Log Message:
Make the DC timeout dependant on the value of ha.cf/initdead
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/control.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -3 -r1.122 -r1.123
--- control.c 7 Apr 2006 15:38:13 -0000 1.122
+++ control.c 10 Apr 2006 15:07:20 -0000 1.123
@@ -562,6 +562,8 @@
enum crmd_fsa_input current_input,
fsa_data_t *msg_data)
{
+ char *param_val = NULL;
+ const char *param_name = NULL;
int call_id = fsa_cib_conn->cmds->query(
fsa_cib_conn, XML_CIB_TAG_CRMCONFIG, NULL, cib_scope_local);
@@ -574,6 +576,18 @@
integration_timer->period_ms = crm_get_msec("3min");
finalization_timer->period_ms = crm_get_msec("3min");
shutdown_escalation_timer->period_ms = crm_get_msec("10min");
+
+ /* apparently we're not allowed to free the result of getenv */
+ param_name = ENV_PREFIX "" KEY_INITDEAD;
+ param_val = getenv(param_name);
+ if(param_val != NULL) {
+ int tmp = crm_get_msec(param_val);
+ if(tmp > 0) {
+ election_trigger->period_ms = 2 * tmp;
+ }
+ crm_debug("%s = %s", param_name, param_val);
+ param_val = NULL;
+ }
return I_NULL;
}
------------------------------
Message: 3
Date: Mon, 10 Apr 2006 09:35:38 -0600 (MDT)
From: [email protected]
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:
control.c
Log Message:
Wait 5s or initdead/2 (whichever is greater) for a DC to respond
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/control.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -3 -r1.123 -r1.124
--- control.c 10 Apr 2006 15:07:20 -0000 1.123
+++ control.c 10 Apr 2006 15:35:37 -0000 1.124
@@ -571,7 +571,7 @@
crm_debug_2("Querying the CIB... call %d", call_id);
/* defaults */
- election_trigger->period_ms = crm_get_msec("30s");
+ election_trigger->period_ms = crm_get_msec("5s");
election_timeout->period_ms = crm_get_msec("2min");
integration_timer->period_ms = crm_get_msec("3min");
finalization_timer->period_ms = crm_get_msec("3min");
@@ -581,9 +581,9 @@
param_name = ENV_PREFIX "" KEY_INITDEAD;
param_val = getenv(param_name);
if(param_val != NULL) {
- int tmp = crm_get_msec(param_val);
- if(tmp > 0) {
- election_trigger->period_ms = 2 * tmp;
+ int tmp = crm_get_msec(param_val) / 2;
+ if(tmp > election_trigger->period_ms) {
+ election_trigger->period_ms = tmp;
}
crm_debug("%s = %s", param_name, param_val);
param_val = NULL;
------------------------------
Message: 4
Date: Mon, 10 Apr 2006 10:18:08 -0600 (MDT)
From: [email protected]
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:
control.c
Log Message:
remove dead code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/control.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -3 -r1.124 -r1.125
--- control.c 10 Apr 2006 15:35:37 -0000 1.124
+++ control.c 10 Apr 2006 16:18:08 -0000 1.125
@@ -706,8 +706,6 @@
return FALSE;
}
- crm_set_ha_options(hb_cluster);
-
crm_debug_3("Be informed of CRM messages");
if (HA_OK != hb_cluster->llc_ops->set_msg_callback(
hb_cluster, T_CRM, crmd_ha_msg_callback, hb_cluster)){
------------------------------
Message: 5
Date: Mon, 10 Apr 2006 10:18:08 -0600 (MDT)
From: [email protected]
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/cib
Modified Files:
main.c
Log Message:
remove dead code
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/cib/main.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- main.c 3 Apr 2006 10:01:35 -0000 1.41
+++ main.c 10 Apr 2006 16:18:08 -0000 1.42
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.41 2006/04/03 10:01:35 andrew Exp $ */
+/* $Id: main.c,v 1.42 2006/04/10 16:18:08 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -357,8 +357,6 @@
return FALSE;
}
- crm_set_ha_options(hb_cluster);
-
crm_debug_3("Be informed of CIB messages");
if (HA_OK != hb_cluster->llc_ops->set_msg_callback(
hb_cluster, T_CIB, cib_peer_callback, hb_cluster)){
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 68
********************************************
