1 file changed, 4 insertions(+)
crmd/pengine.c | 4 ++++
# HG changeset patch
# User Andrew Beekhof <[EMAIL PROTECTED]>
# Date 1226592282 -3600
# Branch stable-1.0
# Node ID 8b546c12a4ea96645e0efa52023370770e7d122a
# Parent dc2f22bd82a55a8fb66386dd8cc7cc12c43150e3
High: crmd: Requests to the CIB should cause any prior PE calculations to be ignored
Problematic sequence of events:
- Invoke the PE
- Another input arrives
- Query the CIB
- Original PE calculation returns
At this point the calculation should be discarded
diff --git a/crmd/pengine.c b/crmd/pengine.c
--- a/crmd/pengine.c
+++ b/crmd/pengine.c
@@ -256,6 +256,10 @@ do_pe_invoke(long long action,
crm_info("Query %d: Requesting the current CIB: %s", fsa_pe_query, fsa_state2string(fsa_state));
+ /* Make sure any queued calculations are discarded */
+ crm_free(fsa_pe_ref);
+ fsa_pe_ref = NULL;
+
fsa_cib_conn->cmds->register_callback(
fsa_cib_conn, fsa_pe_query, 60, FALSE, NULL,
"do_pe_invoke_callback", do_pe_invoke_callback);
_______________________________________________
Pacemaker mailing list
[email protected]
http://list.clusterlabs.org/mailman/listinfo/pacemaker
