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: include by alan 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])
----------------------------------------------------------------------
Message: 1
Date: Wed, 19 Apr 2006 15:08:55 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by alan from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : alan
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include
Modified Files:
heartbeat.h
Log Message:
Decreased the number of transmitted packets we keep track of.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/heartbeat.h,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- heartbeat.h 7 Feb 2006 17:18:24 -0000 1.82
+++ heartbeat.h 19 Apr 2006 21:08:54 -0000 1.83
@@ -1,4 +1,4 @@
-/* $Id: heartbeat.h,v 1.82 2006/02/07 17:18:24 alan Exp $ */
+/* $Id: heartbeat.h,v 1.83 2006/04/19 21:08:54 alan Exp $ */
/*
* heartbeat.h: core definitions for the Linux-HA heartbeat program
*
@@ -223,7 +223,7 @@
typedef unsigned long seqno_t;
-#define MAXMSGHIST 1000
+#define MAXMSGHIST 200
#define MAXMISSING MAXMSGHIST
#define NOSEQUENCE 0xffffffffUL
------------------------------
Message: 2
Date: Thu, 20 Apr 2006 02:59:07 -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:
Increase some timeouts
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/control.c,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -3 -r1.125 -r1.126
--- control.c 10 Apr 2006 16:18:08 -0000 1.125
+++ control.c 20 Apr 2006 08:59:06 -0000 1.126
@@ -411,6 +411,7 @@
enum crmd_fsa_input current_input,
fsa_data_t *msg_data)
{
+ crm_data_t *node_state = NULL;
crm_debug_2("Stopping all remaining local resources");
if(is_set(fsa_input_register, R_LRM_CONNECTED)) {
stop_all_resources();
@@ -426,7 +427,18 @@
crmd_fsa_stall(NULL);
return I_NULL;
}
-
+
+#if 0
+ crm_debug("Sending \"stopped\" update to CIB");
+ node_state = create_node_state(
+ fsa_our_uname, NULL, XML_BOOLEAN_FALSE,
+ OFFLINESTATUS, CRMD_STATE_INACTIVE, NULL, FALSE, __FUNCTION__);
+
+ fsa_cib_anon_update(
+ XML_CIB_TAG_STATUS, node_state, cib_quorum_override);
+#endif
+ free_xml(node_state);
+
return I_NULL;
}
@@ -574,8 +586,8 @@
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");
- shutdown_escalation_timer->period_ms = crm_get_msec("10min");
+ finalization_timer->period_ms = crm_get_msec("10min");
+ shutdown_escalation_timer->period_ms = crm_get_msec("20min");
/* apparently we're not allowed to free the result of getenv */
param_name = ENV_PREFIX "" KEY_INITDEAD;
@@ -685,10 +697,9 @@
fsa_cluster_conn->llc_ops->end_nodewalk(fsa_cluster_conn);
/* Now update the CIB with the list of nodes */
- call_id = fsa_cib_conn->cmds->update(
- fsa_cib_conn, XML_CIB_TAG_NODES, cib_node_list, NULL,
- cib_scope_local|cib_quorum_override|cib_inhibit_bcast);
-
+ fsa_cib_update(
+ XML_CIB_TAG_NODES, cib_node_list,
+ cib_scope_local|cib_quorum_override|cib_inhibit_bcast, call_id);
add_cib_op_callback(call_id, FALSE, NULL, default_cib_update_callback);
free_xml(cib_node_list);
------------------------------
Message: 3
Date: Thu, 20 Apr 2006 02:59:47 -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:
lrm.c
Log Message:
A different approach to determining what type of update to send
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -3 -r1.186 -r1.187
--- lrm.c 18 Apr 2006 11:03:41 -0000 1.186
+++ lrm.c 20 Apr 2006 08:59:47 -0000 1.187
@@ -343,10 +343,23 @@
return TRUE;
}
- caller_version = fsa_our_dc_version;
- CRM_CHECK(fsa_our_dc_version != NULL,
- caller_version = g_hash_table_lookup(
- op->params, XML_ATTR_CRM_VERSION));
+ if(AM_I_DC) {
+ caller_version = CRM_FEATURE_SET;
+
+ } else if(fsa_our_dc_version != NULL) {
+ caller_version = fsa_our_dc_version;
+
+ } else {
+ /* there is a small risk in formerly mixed clusters that
+ * it will be sub-optimal.
+ * however with our upgrade policy, the update we send
+ * should still be completely supported anyway
+ */
+ caller_version = g_hash_table_lookup(
+ op->params, XML_ATTR_CRM_VERSION);
+ crm_warn("Falling back to operation originator version: %s",
+ caller_version);
+ }
crm_debug_3("DC version: %s", caller_version);
if(safe_str_eq(op->op_type, CRMD_ACTION_NOTIFY)) {
------------------------------
Message: 4
Date: Thu, 20 Apr 2006 03:00:06 -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/tengine
Modified Files:
actions.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- actions.c 19 Apr 2006 14:21:39 -0000 1.22
+++ actions.c 20 Apr 2006 09:00:05 -0000 1.23
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.22 2006/04/19 14:21:39 andrew Exp $ */
+/* $Id: actions.c,v 1.23 2006/04/20 09:00:05 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -267,8 +267,8 @@
CRM_CHECK(rsc_id != NULL, return FALSE);
- crm_warn("%s: %s %s on %s timed out",
- crm_element_name(action->xml), task_uuid, rsc_id, target);
+ crm_warn("%s %d: %s on %s timed out",
+ crm_element_name(action->xml), action->id, task_uuid, target);
action_rsc = find_xml_node(action->xml, XML_CIB_TAG_RESOURCE, TRUE);
CRM_CHECK(action_rsc != NULL, return FALSE);
------------------------------
_______________________________________________
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 104
*********************************************
