1 file changed, 1 insertion(+), 1 deletion(-)
crmd/te_callbacks.c | 2 +-
# HG changeset patch
# User Andrew Beekhof <[EMAIL PROTECTED]>
# Date 1226313002 -3600
# Branch stable-1.0
# Node ID 01daf5d2d73c241062c95a194414d29918cb661e
# Parent a93d3368dec6787ea8d55800e08a21ad155aa5e5
Dev: crmd: Timers are also allowed in the S_POLICY_ENGINE state
This can happen if a previous transition was not completed and
the timer happens to expire after the integration stage completes.
Since we want to start a new transition anyway, let it through.
diff --git a/crmd/te_callbacks.c b/crmd/te_callbacks.c
--- a/crmd/te_callbacks.c
+++ b/crmd/te_callbacks.c
@@ -540,7 +540,7 @@ global_timer_callback(gpointer data)
CRM_CHECK(timer->action == NULL, return FALSE);
- if(fsa_state != S_TRANSITION_ENGINE) {
+ if(fsa_state != S_TRANSITION_ENGINE && fsa_state != S_POLICY_ENGINE) {
crm_err("Discarding transition timeout in state: %s", fsa_state2string(fsa_state));
} else if(transition_graph->complete) {
_______________________________________________
Pacemaker mailing list
[email protected]
http://list.clusterlabs.org/mailman/listinfo/pacemaker
