1 file changed, 5 insertions(+), 2 deletions(-)
crmd/pengine.c | 7 +++++--
# HG changeset patch
# User Andrew Beekhof <[EMAIL PROTECTED]>
# Date 1226592010 -3600
# Branch stable-1.0
# Node ID dc2f22bd82a55a8fb66386dd8cc7cc12c43150e3
# Parent f5a2521a74509fdb1883ba601aa896cfce515a10
High: crmd: Ensure PE processing does not occur for all error cases in do_pe_invoke_callback
diff --git a/crmd/pengine.c b/crmd/pengine.c
--- a/crmd/pengine.c
+++ b/crmd/pengine.c
@@ -251,9 +251,10 @@ do_pe_invoke(long long action,
return;
}
- crm_debug("Requesting the current CIB: %s",fsa_state2string(fsa_state));
fsa_pe_query = fsa_cib_conn->cmds->query(
fsa_cib_conn, NULL, NULL, cib_scope_local);
+
+ crm_info("Query %d: Requesting the current CIB: %s", fsa_pe_query, fsa_state2string(fsa_state));
fsa_cib_conn->cmds->register_callback(
fsa_cib_conn, fsa_pe_query, 60, FALSE, NULL,
@@ -269,6 +270,7 @@ do_pe_invoke_callback(xmlNode *msg, int
if(rc != cib_ok) {
crm_err("Cant retrieve the CIB: %s", cib_error2string(rc));
register_fsa_error_adv(C_FSA_INTERNAL, I_ERROR, NULL, NULL, __FUNCTION__);
+ return;
} else if(call_id != fsa_pe_query) {
crm_debug_2("Skipping superceeded CIB query: %d (current=%d)",
@@ -295,6 +297,7 @@ do_pe_invoke_callback(xmlNode *msg, int
} else if(fsa_state != S_POLICY_ENGINE) {
crm_err("Invoking PE in state: %s", fsa_state2string(fsa_state));
+ return;
}
CRM_DEV_ASSERT(output != NULL);
@@ -320,7 +323,7 @@ do_pe_invoke_callback(xmlNode *msg, int
register_fsa_error_adv(C_FSA_INTERNAL, I_ERROR, NULL, NULL, __FUNCTION__);
}
- crm_debug("Invoking the PE: ref=%s, seq=%llu, quorate=%d",
+ crm_info("Invoking the PE: ref=%s, seq=%llu, quorate=%d",
fsa_pe_ref, crm_peer_seq, fsa_has_quorum);
free_xml(cmd);
}
_______________________________________________
Pacemaker mailing list
Pacemaker@clusterlabs.org
http://list.clusterlabs.org/mailman/listinfo/pacemaker
