pool/pacemaker
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Rebase:

Browse Source 
* pacemaker-colocated-utilization.patch

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=138
This commit is contained in:
Yan Gao 2014-05-27 11:13:26 +00:00 committed by Git OBS Bridge
parent e8a9b3da0b
commit 3189bb8bb5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pacemaker-colocated-utilization.patch
View File

@ -317,9 +317,9 @@ Index: pacemaker/pengine/native.c
CRM_ASSERT(rsc_rh); CRM_ASSERT(rsc_rh);
- filter_results = filter_colocation_constraint(rsc_lh, rsc_rh, constraint); - filter_results = filter_colocation_constraint(rsc_lh, rsc_rh, constraint);
+ filter_results = filter_colocation_constraint(rsc_lh, rsc_rh, constraint, FALSE); + filter_results = filter_colocation_constraint(rsc_lh, rsc_rh, constraint, FALSE);
pe_rsc_trace(rsc_lh, "%sColocating %s with %s (%s, weight=%d, filter=%d)",
switch (filter_results) { constraint->score >= 0 ? "" : "Anti-",
case influence_rsc_priority: rsc_lh->id, rsc_rh->id, constraint->id, constraint->score, filter_results);
@@ -3307,3 +3447,86 @@ native_append_meta(resource_t * rsc, xml @@ -3307,3 +3447,86 @@ native_append_meta(resource_t * rsc, xml
free(name); free(name);
} }

3
pacemaker.changes
View File

@ -1,6 +1,9 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 27 09:39:48 UTC 2014 - ygao@suse.com 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 - 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: 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) - pengine: Block restart of resources if any dependent resource in a group is unmanaged (bnc#878662)