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: include by andrew from
([email protected])
4. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sat, 18 Feb 2006 05:39:54 -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 join_dc.c
Log Message:
FSA fix: Need to send A_SHUTDOWN_REQ when we're in S_TRANSITION_ENGINE and
recieve I_SHUTDOWN
FSA Fix: need to send A_DC_JOIN_OFFER_ALL (to start a new join) when we
get I_ELECTION_DC in S_INTEGRATION or S_FINALIZE_JOIN
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/fsa_matrix.h,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -3 -r1.67 -r1.68
--- fsa_matrix.h 17 Feb 2006 13:34:03 -0000 1.67
+++ fsa_matrix.h 18 Feb 2006 12:39:54 -0000 1.68
@@ -797,8 +797,8 @@
{
/* S_IDLE ==> */ A_WARN|A_ELECTION_VOTE,
/* S_ELECTION ==> */
A_LOG|A_DC_TAKEOVER|A_PE_START|A_TE_START|A_DC_JOIN_OFFER_ALL|A_DC_TIMER_STOP,
- /* S_INTEGRATION ==> */ A_WARN,
- /* S_FINALIZE_JOIN ==> */ A_WARN|A_ELECTION_VOTE,
+ /* S_INTEGRATION ==> */
A_WARN|A_ELECTION_VOTE|A_DC_JOIN_OFFER_ALL,
+ /* S_FINALIZE_JOIN ==> */
A_WARN|A_ELECTION_VOTE|A_DC_JOIN_OFFER_ALL,
/* S_NOT_DC ==> */ A_LOG|A_ELECTION_VOTE,
/* S_POLICY_ENGINE ==> */ A_WARN|A_ELECTION_VOTE,
/* S_RECOVERY ==> */ A_WARN,
@@ -1041,7 +1041,7 @@
/* S_PENDING ==> */ A_SHUTDOWN_REQ,
/* S_STOPPING ==> */ A_LOG,
/* S_TERMINATE ==> */ A_LOG,
- /* S_TRANSITION_ENGINE ==> */ A_WARN,
+ /* S_TRANSITION_ENGINE ==> */ A_WARN|A_SHUTDOWN_REQ,
/* S_HALT ==> */
A_WARN|A_ELECTION_START|A_SHUTDOWN_REQ,
},
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/join_dc.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- join_dc.c 17 Feb 2006 14:44:03 -0000 1.78
+++ join_dc.c 18 Feb 2006 12:39:54 -0000 1.79
@@ -351,7 +351,6 @@
fsa_cib_conn->cmds->sync_from(
fsa_cib_conn, fsa_our_uname, NULL,cib_quorum_override);
}
-
finalize_join(__FUNCTION__);
@@ -370,8 +369,8 @@
(char*)user_data, cib_error2string(rc));
/* restart the whole join process */
- register_fsa_error_adv(C_FSA_INTERNAL, I_ELECTION_DC,
- NULL, NULL, __FUNCTION__);
+ register_fsa_error_adv(
+ C_FSA_INTERNAL, I_ELECTION_DC,NULL,NULL,__FUNCTION__);
} else if(AM_I_DC && fsa_state == S_FINALIZE_JOIN) {
finalize_join(__FUNCTION__);
------------------------------
Message: 2
Date: Sat, 18 Feb 2006 05:41:19 -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:
lrm.c
Log Message:
Same value, more consistent #define name
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -3 -r1.165 -r1.166
--- lrm.c 16 Feb 2006 15:17:13 -0000 1.165
+++ lrm.c 18 Feb 2006 12:41:19 -0000 1.166
@@ -642,7 +642,7 @@
crm_data_t *xml_state = NULL;
crm_data_t *xml_data = NULL;
crm_data_t *rsc_list = NULL;
- const char *exp_state = CRMD_STATE_ACTIVE;
+ const char *exp_state = CRMD_JOINSTATE_MEMBER;
if(is_set(fsa_input_register, R_SHUTDOWN)) {
exp_state = CRMD_STATE_INACTIVE;
------------------------------
Message: 3
Date: Sat, 18 Feb 2006 05:43:02 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm
Modified Files:
transition.h
Log Message:
Hook up the transition timer again
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/transition.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- transition.h 16 Feb 2006 15:20:32 -0000 1.2
+++ transition.h 18 Feb 2006 12:43:02 -0000 1.3
@@ -1,4 +1,4 @@
-/* $Id: transition.h,v 1.2 2006/02/16 15:20:32 andrew Exp $ */
+/* $Id: transition.h,v 1.3 2006/02/18 12:43:02 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -70,7 +70,6 @@
enum timer_reason {
timeout_action,
timeout_action_warn,
- timeout_timeout,
timeout_abort,
};
@@ -83,8 +82,10 @@
};
+/* order matters here */
enum transition_action {
tg_stop,
+ tg_abort,
tg_restart,
tg_shutdown,
};
------------------------------
Message: 4
Date: Sat, 18 Feb 2006 05:43:03 -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/tengine
Modified Files:
actions.c callbacks.c
Log Message:
Hook up the transition timer again
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/actions.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- actions.c 17 Feb 2006 13:30:39 -0000 1.10
+++ actions.c 18 Feb 2006 12:43:02 -0000 1.11
@@ -1,4 +1,4 @@
-/* $Id: actions.c,v 1.10 2006/02/17 13:30:39 andrew Exp $ */
+/* $Id: actions.c,v 1.11 2006/02/18 12:43:02 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -380,8 +380,16 @@
trigger_graph();
} else if(action->timeout > 0) {
+ int action_timeout = 2 * action->timeout;
crm_debug_3("Setting timer for action %s", task_uuid);
action->timer->reason = timeout_action_warn;
+ if(transition_graph->transition_timeout < action_timeout) {
+ crm_debug("Action %d:"
+ " Increasing transition %d timeout to %d",
+ action->id, transition_graph->id,
+ transition_graph->transition_timeout);
+ transition_graph->transition_timeout = action_timeout;
+ }
start_te_timer(action->timer);
}
}
@@ -407,13 +415,13 @@
const char *op = CRM_OP_TEABORT;
if(unconfirmed != 0) {
- crm_err("Writing unconfirmed actions to the CIB");
+ crm_err("Write %d unconfirmed actions to the CIB", unconfirmed);
/* TODO: actually write them */
/* return; */
}
if(pending_callbacks != 0) {
- crm_debug("Delaying completion until TE updates to the CIB
complete");
+ crm_err("Delaying completion until all CIB updates complete");
return;
}
@@ -431,6 +439,7 @@
log_level = LOG_INFO;
break;
+ case tg_abort:
case tg_restart:
op = CRM_OP_TEABORT;
break;
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/tengine/callbacks.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -3 -r1.66 -r1.67
--- callbacks.c 17 Feb 2006 13:30:39 -0000 1.66
+++ callbacks.c 18 Feb 2006 12:43:02 -0000 1.67
@@ -1,4 +1,4 @@
-/* $Id: callbacks.c,v 1.66 2006/02/17 13:30:39 andrew Exp $ */
+/* $Id: callbacks.c,v 1.67 2006/02/18 12:43:02 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -369,34 +369,23 @@
}
timer = (te_timer_t*)data;
- if(timer->source_id > 0) {
- Gmain_timeout_remove(timer->source_id);
- }
- timer->source_id = 0;
+ stop_te_timer(timer);
- crm_warn("Timer popped in abort_level=%d",
- transition_graph->abort_priority);
- if(timer->reason == timeout_abort) {
- crm_err("Transition abort timeout reached..."
- " marking transition complete.");
+ crm_warn("Timer popped (abort_level=%d, complete=%s)",
+ transition_graph->abort_priority,
+ transition_graph->complete?"true":"false");
- abort_transition(INFINITY, -1, "Global Timeout", NULL);
- return TRUE;
-
- } else if(transition_graph->complete) {
- crm_debug("Ignoring timeout while not in transition");
+ if(transition_graph->complete) {
+ crm_err("Ignoring timeout while not in transition");
return TRUE;
- } else if(timer->reason == timeout_timeout) {
-
- /* global timeout - abort the transition */
- crm_warn("Transition timeout reached..."
+ } else if(timer->reason == timeout_abort) {
+ crm_err("Transition abort timeout reached..."
" marking transition complete.");
-
- crm_warn("Some actions may not have been executed.");
-
+ print_graph(LOG_WARNING, transition_graph);
+
+ transition_graph->complete = TRUE;
abort_transition(INFINITY, -1, "Global Timeout", NULL);
-
return TRUE;
} else if(timer->action == NULL) {
@@ -430,11 +419,21 @@
notify_crmd(transition_graph);
return TRUE;
}
-
+
+ if(transition_timer == NULL) {
+ crm_malloc0(transition_timer, sizeof(te_timer_t));
+ transition_timer->source_id = 0;
+ transition_timer->reason = timeout_abort;
+ transition_timer->action = NULL;
+
+ } else {
+ stop_te_timer(transition_timer);
+ }
+
graph_rc = run_graph(transition_graph);
- stop_te_timer(transition_timer);
print_graph(LOG_DEBUG_2, transition_graph);
-
+
+ transition_timer->timeout = transition_graph->transition_timeout;
if(graph_rc == transition_active) {
crm_debug_3("Transition not yet complete");
/* restart the transition timer again */
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 27, Issue 77
********************************************
