diff --git a/_service b/_service index 5f39f92..24e9012 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.11 --> 1.1.11+git%cd.%h - da5aaab97ca5b7858f2aac98107a1a7ffc3e4252 + 97629ded958f76652350569a54303b3cd25d1d7e diff --git a/pacemaker-1.1.11+git20140512.da5aaab.tar.bz2 b/pacemaker-1.1.11+git20140512.da5aaab.tar.bz2 deleted file mode 100644 index 655c883..0000000 --- a/pacemaker-1.1.11+git20140512.da5aaab.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ea75089b844325190b73cab5ec138b00b4581a9bf91fa8a5ea2dd32f91291a8 -size 9378846 diff --git a/pacemaker-1.1.11+git20140613.97629de.tar.bz2 b/pacemaker-1.1.11+git20140613.97629de.tar.bz2 new file mode 100644 index 0000000..5eac8b6 --- /dev/null +++ b/pacemaker-1.1.11+git20140613.97629de.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb27e89681d36c92974e2d9594d7d3c84e7753db0102d26ed6c7853e18ab3ccb +size 9321002 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 92952ba..621c607 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Fri Jun 13 03:16:29 UTC 2014 - ygao@suse.com + +- Bug cl#5219 - PE: Allow unrelated resources with a common colocation target to remain promoted +- Bug cl#5222 - Enable legacy mode whenever a broadcast update is detected (bnc#881575) +- xml: Prevent incorrect xml diffs from corrupting the cib (bnc#878362) +- mainloop: implement gio_poll_dispatch_mod +- cluster: Prevent search of unames from attempting to create node entries for unknown nodes (bnc#881884) +- Upstream version cs: 97629ded958f76652350569a54303b3cd25d1d7e + +------------------------------------------------------------------- +Wed Jun 11 05:44:21 UTC 2014 - ygao@suse.com + +- crm_report: Gracefully handle rediculously large logfiles +- Bug cl#5222 - cib: Repair rolling update capability (bnc#881575) +- cib: Use a better option name for enabling the legacy cib diff code (cl#5222, bnc#881575) +- remote: clear remote-node status correctly +- pengine: properly handle fencing of container remote-nodes when the container is orphaned +- remote: Handle request/response ipc proxy correctly +- cib: Prevent assert on sending cib sync requests (cl#5222, bnc#881575) +- crm_simulate: Clean up temporary shadow files on exit (bnc#879934) +- pengine: cl#5200 - Before migrating utilization-using resources to a node, take off the load that will no longer run there if it's not introducing transition loop + (Rework cl#5044, lf#2599, bnc#695440) +- Fencing: Cache metadata lookups to avoid repeated blocking during device registration +- pengine: properly place resource within a container when container is a remote-node. +- mainloop: Better handle the killing of processes in the act of exiting +- services: Remove cancelled recurring ops from internal lists as early as possible +- services: Remove file descriptors from mainloop as soon as we have drained them +- pengine: Don't report a resource as restarting when it is a moving multistate resource +- pengine: avoid assert by searching for stop action on correct node during LogActions +- Upstream version cs: 734e6b538b0a037f9e7d0709f450bd664f26c332 + +------------------------------------------------------------------- +Mon Jun 2 03:17:54 UTC 2014 - ygao@suse.com + +- cib: Drop the message serverity now that the cause is well understood +- crmd: Avoid spamming the cib by triggering a transition only once per non-status change +- Upstream version cs: 559f733e8818a96085134cd2a34efc280c512a2a + +------------------------------------------------------------------- +Thu May 29 10:38:11 UTC 2014 - ygao@suse.com + +- pengine: Prevent possible segfault (bnc#880258) +- attrd: Ensure attribute dampening is always observed +- Bug cl#5213 - Limit the scope of the previous commit to the masters role +- membership: Avoid duplicate peer entries in the peer cache +- Bug cl#5184 - Ensure pending probes that ultimately fail are correctly updated (bnc#804763, bnc#879034) +- Upstream version cs: 9776707a6232f25812009145fafa8a64c5b53910 + +------------------------------------------------------------------- +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) +- systemd: Try to handle dbus actions that complete prior to configuring a callback +- mainloop: Canceling in-flight operations should not fail if child process has already exited. +- Bug rhbz#1097457 - Limit the scope of the previous fix and include a helpful comment +- Bug cl#5212 - Do not promote instances when quorum is lots and no-quorum-policy=freeze +- Bug rhbz#1097457 - Prevent invalid transition when resource are ordered to start after the container they're started in +- Fix: fix small memory leaks +- Upstream version cs: 25ebca2b83df9263aedb944ea4eeb53468e90e83 + ------------------------------------------------------------------- Fri May 23 07:33:51 UTC 2014 - jsegitz@novell.com @@ -91,7 +157,7 @@ Fri Apr 11 15:07:26 UTC 2014 - ygao@suse.com - fencing: properly detect new fencing devices for v2 cib updates - acl: Prevent use-of-NULL - cts: automatically determine whether to run RemoteBaremetal (bnc#856353) -- pengine: Correctly search failcount +- pengine: Correctly search failcount (bnc#880520) - Upstream version cs: ff74a591e670dbdb86f7cddeec989167de521216 ------------------------------------------------------------------- diff --git a/pacemaker.spec b/pacemaker.spec index ede23c7..482bb1a 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -99,7 +99,7 @@ Name: pacemaker Summary: Scalable High-Availability cluster resource manager License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA -Version: 1.1.11+git20140512.da5aaab +Version: 1.1.11+git20140613.97629de Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org