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: crm 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])
----------------------------------------------------------------------
Message: 1
Date: Fri, 13 Jan 2006 12:02:38 -0700 (MST)
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:
fsa_matrix.h fsa_defines.h
Log Message:
The DC timer is basically obsolete - so remove all the O_DC_TICKLE stuff
Resolve a bug that left slave nodes in S_PENDING after receiving
I_JOIN_RESULT in S_NOT_DC. The transition was correct but there was
no action scheduled that would get it out again.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa_matrix.h,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- fsa_matrix.h 10 Jan 2006 13:46:42 -0000 1.63
+++ fsa_matrix.h 13 Jan 2006 19:02:38 -0000 1.64
@@ -280,7 +280,7 @@
/* Got an I_NOT_DC */
{
/* S_IDLE ==> */ S_RECOVERY,
- /* S_ELECTION ==> */ S_PENDING,
+ /* S_ELECTION ==> */ S_ELECTION,
/* S_INTEGRATION ==> */ S_RECOVERY,
/* S_FINALIZE_JOIN ==> */ S_RECOVERY,
/* S_NOT_DC ==> */ S_NOT_DC,
@@ -903,19 +903,19 @@
/* Got an I_NOT_DC */
{
- /* S_IDLE ==> */ A_WARN|O_RELEASE|O_DC_TICKLE,
- /* S_ELECTION ==> */
A_LOG|O_DC_TICKLE|A_DC_TIMER_STOP,
- /* S_INTEGRATION ==> */ A_WARN|O_RELEASE,
- /* S_FINALIZE_JOIN ==> */ A_WARN|O_RELEASE,
- /* S_NOT_DC ==> */ O_DC_TICKLE,
- /* S_POLICY_ENGINE ==> */ A_WARN|O_RELEASE,
- /* S_RECOVERY ==> */ A_WARN|O_RELEASE,
- /* S_RELEASE_DC ==> */ O_RELEASE,
+ /* S_IDLE ==> */ A_WARN|O_RELEASE,
+ /* S_ELECTION ==> */
A_ERROR|A_ELECTION_START|A_DC_TIMER_STOP,
+ /* S_INTEGRATION ==> */ A_ERROR|O_RELEASE,
+ /* S_FINALIZE_JOIN ==> */ A_ERROR|O_RELEASE,
+ /* S_NOT_DC ==> */ A_LOG,
+ /* S_POLICY_ENGINE ==> */ A_ERROR|O_RELEASE,
+ /* S_RECOVERY ==> */ A_ERROR|O_RELEASE,
+ /* S_RELEASE_DC ==> */ A_ERROR|O_RELEASE,
/* S_STARTING ==> */ A_WARN,
/* S_PENDING ==> */ A_LOG|A_DC_TIMER_STOP,
/* S_STOPPING ==> */ A_WARN,
/* S_TERMINATE ==> */ A_WARN,
- /* S_TRANSITION_ENGINE ==> */ A_WARN|O_RELEASE,
+ /* S_TRANSITION_ENGINE ==> */ A_ERROR|O_RELEASE,
/* S_HALT ==> */ A_WARN,
},
@@ -1119,19 +1119,19 @@
/* Got an I_JOIN_OFFER */
{
- /* S_IDLE ==> */ A_CL_JOIN_REQUEST,
+ /* S_IDLE ==> */ A_WARN|A_CL_JOIN_REQUEST,
/* S_ELECTION ==> */ A_WARN,
/* S_INTEGRATION ==> */ A_CL_JOIN_REQUEST,
/* S_FINALIZE_JOIN ==> */ A_CL_JOIN_REQUEST,
- /* S_NOT_DC ==> */
O_DC_TICKLE|A_CL_JOIN_REQUEST|A_DC_TIMER_STOP,
- /* S_POLICY_ENGINE ==> */ A_CL_JOIN_REQUEST,
- /* S_RECOVERY ==> */
O_RELEASE|A_CL_JOIN_REQUEST|A_DC_TIMER_STOP,
- /* S_RELEASE_DC ==> */
A_CL_JOIN_REQUEST|A_DC_TIMER_STOP,
+ /* S_NOT_DC ==> */
A_CL_JOIN_REQUEST|A_DC_TIMER_STOP,
+ /* S_POLICY_ENGINE ==> */ A_WARN|A_CL_JOIN_REQUEST,
+ /* S_RECOVERY ==> */
A_WARN|A_CL_JOIN_REQUEST|A_DC_TIMER_STOP,
+ /* S_RELEASE_DC ==> */
A_WARN|A_CL_JOIN_REQUEST|A_DC_TIMER_STOP,
/* S_STARTING ==> */ A_LOG,
- /* S_PENDING ==> */
O_DC_TICKLE|A_CL_JOIN_REQUEST|A_DC_TIMER_STOP,
+ /* S_PENDING ==> */
A_CL_JOIN_REQUEST|A_DC_TIMER_STOP,
/* S_STOPPING ==> */ A_LOG,
/* S_TERMINATE ==> */ A_LOG,
- /* S_TRANSITION_ENGINE ==> */ A_CL_JOIN_REQUEST,
+ /* S_TRANSITION_ENGINE ==> */ A_WARN|A_CL_JOIN_REQUEST,
/* S_HALT ==> */ A_WARN,
},
@@ -1159,12 +1159,12 @@
/* S_ELECTION ==> */ A_LOG,
/* S_INTEGRATION ==> */ A_LOG,
/* S_FINALIZE_JOIN ==> */
A_CL_JOIN_RESULT|A_DC_JOIN_PROCESS_ACK,
- /* S_NOT_DC ==> */ A_LOG|O_DC_TICKLE,
+ /* S_NOT_DC ==> */ A_ERROR|A_CL_JOIN_ANNOUNCE,
/* S_POLICY_ENGINE ==> */
A_ERROR|A_TE_CANCEL|A_DC_JOIN_OFFER_ALL,
/* S_RECOVERY ==> */ A_LOG,
/* S_RELEASE_DC ==> */ A_LOG,
/* S_STARTING ==> */ A_ERROR,
- /* S_PENDING ==> */ A_CL_JOIN_RESULT|O_DC_TICKLE,
+ /* S_PENDING ==> */ A_CL_JOIN_RESULT,
/* S_STOPPING ==> */ A_ERROR,
/* S_TERMINATE ==> */ A_ERROR,
/* S_TRANSITION_ENGINE ==> */
A_ERROR|A_TE_CANCEL|A_DC_JOIN_OFFER_ALL,
@@ -1195,16 +1195,16 @@
/* S_ELECTION ==> */ A_WARN|A_ELECTION_VOTE,
/* S_INTEGRATION ==> */ A_ERROR,
/* S_FINALIZE_JOIN ==> */ A_ERROR,
- /* S_NOT_DC ==> */ O_DC_TICKLE,
+ /* S_NOT_DC ==> */ A_NOTHING,
/* S_POLICY_ENGINE ==> */ A_ERROR,
- /* S_RECOVERY ==> */ A_NOTHING|O_DC_TICKLE,
+ /* S_RECOVERY ==> */ A_NOTHING,
/* S_RELEASE_DC ==> */ A_LOG,
/* S_STARTING ==> */ A_LOG,
- /* S_PENDING ==> */
A_LOG|O_DC_TICKLE|A_CL_JOIN_ANNOUNCE,
+ /* S_PENDING ==> */ A_LOG|A_CL_JOIN_ANNOUNCE,
/* S_STOPPING ==> */ A_NOTHING,
/* S_TERMINATE ==> */ A_NOTHING,
/* S_TRANSITION_ENGINE ==> */ A_ERROR,
- /* S_HALT ==> */ A_WARN|O_DC_TICKLE,
+ /* S_HALT ==> */ A_WARN,
},
/* Got an I_LRM_EVENT */
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa_defines.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -3 -r1.41 -r1.42
--- fsa_defines.h 10 Jan 2006 13:46:42 -0000 1.41
+++ fsa_defines.h 13 Jan 2006 19:02:38 -0000 1.42
@@ -1,4 +1,4 @@
-/* $Id: fsa_defines.h,v 1.41 2006/01/10 13:46:42 andrew Exp $ */
+/* $Id: fsa_defines.h,v 1.42 2006/01/13 19:02:38 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -403,8 +403,6 @@
#define O_TE_RESTART (A_TE_START|A_TE_STOP)
#define O_CIB_RESTART (A_CIB_START|A_CIB_STOP)
-#define O_DC_TICKLE O_DC_TIMER_RESTART
-
/*======================================
*
* "register" contents
------------------------------
Message: 2
Date: Fri, 13 Jan 2006 12:04:13 -0700 (MST)
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:
callbacks.c
Log Message:
Just use the channel's field
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/callbacks.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -3 -r1.98 -r1.99
--- callbacks.c 12 Jan 2006 17:50:46 -0000 1.98
+++ callbacks.c 13 Jan 2006 19:04:12 -0000 1.99
@@ -253,7 +253,7 @@
crm_debug_3("received callback");
lrm->lrm_ops->rcvmsg(lrm, FALSE);
- if(lrm_channel->ops->get_chan_status(lrm_channel) != IPC_CONNECT) {
+ if(lrm_channel->ch_status != IPC_CONNECT) {
if(is_set(fsa_input_register, R_LRM_CONNECTED)) {
crm_err("LRM Connection failed");
register_fsa_input(C_FSA_INTERNAL, I_ERROR, NULL);
------------------------------
Message: 3
Date: Fri, 13 Jan 2006 12:21:00 -0700 (MST)
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:
join_client.c
Log Message:
logging tweaks
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_client.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- join_client.c 12 Jan 2006 15:10:08 -0000 1.34
+++ join_client.c 13 Jan 2006 19:21:00 -0000 1.35
@@ -81,8 +81,6 @@
return I_NULL;
}
- crm_err("Called? Operational=%d", AM_I_OPERATIONAL);
-
if(AM_I_OPERATIONAL) {
const char *hb_from = cl_get_string(
input->msg, F_CRM_HOST_FROM);
@@ -148,13 +146,15 @@
return I_NULL;
}
#endif
- crm_debug("Processing join offer: join-%s",
- cl_get_string(input->msg, F_CRM_TASK));
+ crm_debug("Accepting join offer: join-%s",
+ cl_get_string(input->msg, F_CRM_JOIN_ID));
+
/* we only ever want the last one */
if(query_call_id > 0) {
crm_debug("Cancelling previous join query: %d", query_call_id);
remove_cib_op_callback(query_call_id, FALSE);
+ query_call_id = 0;
}
if(fsa_our_dc == NULL) {
@@ -274,16 +274,18 @@
crm_debug_2("Discovering local LRM status");
tmp1 = do_lrm_query(TRUE);
if(tmp1 != NULL) {
- const char *join_id = ha_msg_value(input->msg, F_CRM_JOIN_ID);
HA_Message *reply = create_request(
CRM_OP_JOIN_CONFIRM, tmp1, fsa_our_dc,
CRM_SYSTEM_DC, CRM_SYSTEM_CRMD, NULL);
- ha_msg_add(reply, F_CRM_JOIN_ID, join_id);
+ ha_msg_add_int(reply, F_CRM_JOIN_ID, join_id);
- crm_debug_2("Sending local LRM status");
+ crm_debug("join-%d: Join complete. Sending local LRM status.",
+ join_id);
send_msg_via_ha(fsa_cluster_conn, reply);
if(AM_I_DC == FALSE) {
- register_fsa_input(cause, I_NOT_DC, NULL);
+/* register_fsa_input_adv(cause, I_NOT_DC, NULL, */
+/* A_NOTHING, FALSE, __FUNCTION__);
*/
+ register_fsa_input(cause, I_NOT_DC, NULL);
}
free_xml(tmp1);
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 26, Issue 30
********************************************
