From 3189bb8bb563641290a401161c1c1ea329a51f469b71ea21067920fabc0c82eb Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Tue, 27 May 2014 11:13:26 +0000 Subject: [PATCH] - Rebase: * pacemaker-colocated-utilization.patch OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=138 --- pacemaker-colocated-utilization.patch | 6 +++--- pacemaker.changes | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pacemaker-colocated-utilization.patch b/pacemaker-colocated-utilization.patch index 99a7ade..2bacf7b 100644 --- a/pacemaker-colocated-utilization.patch +++ b/pacemaker-colocated-utilization.patch @@ -317,9 +317,9 @@ Index: pacemaker/pengine/native.c CRM_ASSERT(rsc_rh); - filter_results = filter_colocation_constraint(rsc_lh, rsc_rh, constraint); + filter_results = filter_colocation_constraint(rsc_lh, rsc_rh, constraint, FALSE); - - switch (filter_results) { - case influence_rsc_priority: + pe_rsc_trace(rsc_lh, "%sColocating %s with %s (%s, weight=%d, filter=%d)", + constraint->score >= 0 ? "" : "Anti-", + rsc_lh->id, rsc_rh->id, constraint->id, constraint->score, filter_results); @@ -3307,3 +3447,86 @@ native_append_meta(resource_t * rsc, xml free(name); } diff --git a/pacemaker.changes b/pacemaker.changes index 13ac503..a27e1b1 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,6 +1,9 @@ ------------------------------------------------------------------- Tue May 27 09:39:48 UTC 2014 - ygao@suse.com +- Rebase: + * pacemaker-colocated-utilization.patch + - Bug cl#5213 - Ensure role colocation with -INFINITY is enforced - pengine: Mark unrunnable stop actions as "blocked" and show the correct current locations (bnc#878662) - pengine: Block restart of resources if any dependent resource in a group is unmanaged (bnc#878662)