diff --git a/_service b/_service index 01ec0a9..5f39f92 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.11 --> 1.1.11+git%cd.%h - 6442c5a67cdd4cbaeedb2c532e0dc0667a79c202 + da5aaab97ca5b7858f2aac98107a1a7ffc3e4252 diff --git a/bug-812269_pacemaker-fencing-device-register-messages.patch b/bug-812269_pacemaker-fencing-device-register-messages.patch index b7b4aef..9485d93 100644 --- a/bug-812269_pacemaker-fencing-device-register-messages.patch +++ b/bug-812269_pacemaker-fencing-device-register-messages.patch @@ -8,15 +8,6 @@ Index: pacemaker-1.1.11+git20140303.ca8234d/fencing/commands.c =================================================================== --- pacemaker-1.1.11+git20140303.ca8234d.orig/fencing/commands.c +++ pacemaker-1.1.11+git20140303.ca8234d/fencing/commands.c -@@ -817,7 +817,7 @@ stonith_device_register(xmlNode * msg, c - - dup = device_has_duplicate(device); - if (dup) { -- crm_notice("Device '%s' already existed in device list (%d active devices)", device->id, -+ crm_info("Device '%s' already existed in device list (%d active devices)", device->id, - g_hash_table_size(device_list)); - free_device(device); - device = dup; @@ -840,7 +840,7 @@ stonith_device_register(xmlNode * msg, c } g_hash_table_replace(device_list, device->id, device); diff --git a/pacemaker-1.1.11+git20140409.6442c5a.tar.bz2 b/pacemaker-1.1.11+git20140409.6442c5a.tar.bz2 deleted file mode 100644 index 330ce04..0000000 --- a/pacemaker-1.1.11+git20140409.6442c5a.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5e3e3b0ec854e1b571bebe4f22a6628357ebb0894299055815ac4f5b34ffbb0 -size 9428490 diff --git a/pacemaker-1.1.11+git20140512.da5aaab.tar.bz2 b/pacemaker-1.1.11+git20140512.da5aaab.tar.bz2 new file mode 100644 index 0000000..655c883 --- /dev/null +++ b/pacemaker-1.1.11+git20140512.da5aaab.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ea75089b844325190b73cab5ec138b00b4581a9bf91fa8a5ea2dd32f91291a8 +size 9378846 diff --git a/pacemaker-NodeUtilization-RA.patch b/pacemaker-NodeUtilization-RA.patch index dcd33c6..2395d35 100644 --- a/pacemaker-NodeUtilization-RA.patch +++ b/pacemaker-NodeUtilization-RA.patch @@ -17,7 +17,7 @@ Index: pacemaker/extra/resources/Makefile.am + NodeUtilization if BUILD_XML_HELP - man7_MANS = $(ocf_SCRIPTS:%=ocf_pacemaker_%.7) + Index: pacemaker/extra/resources/NodeUtilization =================================================================== --- /dev/null diff --git a/pacemaker-colocated-utilization.patch b/pacemaker-colocated-utilization.patch index fb38b38..99a7ade 100644 --- a/pacemaker-colocated-utilization.patch +++ b/pacemaker-colocated-utilization.patch @@ -84,10 +84,14 @@ Index: pacemaker/pengine/native.c gboolean is_enough; }; -@@ -95,27 +95,119 @@ check_capacity(gpointer key, gpointer va +@@ -95,30 +95,122 @@ check_capacity(gpointer key, gpointer va remaining = crm_parse_int(g_hash_table_lookup(data->node->details->utilization, key), "0"); - + if (required > remaining) { +- CRM_ASSERT(data->rsc); ++ CRM_ASSERT(data->rsc_id); + CRM_ASSERT(data->node); + - pe_rsc_debug(data->rsc, - "Node %s has no enough %s for resource %s: required=%d remaining=%d", - data->node->details->uname, (char *)key, data->rsc->id, required, remaining); @@ -308,9 +312,9 @@ Index: pacemaker/pengine/native.c struct node_shared_s *details_lh; struct node_shared_s *details_rh; @@ -1550,7 +1690,7 @@ native_rsc_colocation_rh(resource_t * rs - { - enum filter_colocation_res filter_results; + CRM_ASSERT(rsc_lh); + 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); diff --git a/pacemaker.changes b/pacemaker.changes index f9f8922..d4ebb86 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,94 @@ +------------------------------------------------------------------- +Mon May 12 09:20:16 UTC 2014 - ygao@suse.com + +- pengine: Use "#site-name" in rules for setting site-specific instance attributes +- pengine: Use "#cluster-name" in rules for setting cluster-specific instance attributes (FATE#316118) +- crmd: Set "cluster-name" property to corosync's "cluster_name" by default for corosync-2 (FATE#316118) +- pengine: Fixed so that it could change while a setup of "startup-fencing" starts. +- crmd: Use correctly signed inputs to sscanf() +- PE: Correctly handle origin offsets in the future +- iso8601: Different logic is needed when logging and calculating durations +- xml: Do not prune meaningful leaves from v1 patchsets +- Upstream version cs: da5aaab97ca5b7858f2aac98107a1a7ffc3e4252 + +------------------------------------------------------------------- +Thu May 8 11:30:57 CEST 2014 - ro@suse.de + +- use _rundir macro + +------------------------------------------------------------------- +Mon May 5 07:42:25 UTC 2014 - ygao@suse.com + +- Rebase: + * pacemaker-NodeUtilization-RA.patch + * pacemaker-colocated-utilization.patch + +- xml: Clean up schema list at exit +- pengine: Support site-specific instance attributes based on rules for stretch cluster +- pengine: Support cluster-specific instance attributes based on rules (FATE#316118) +- crmd: Ensure crm_config options are re-read on updates +- Resolve all clang analyser defects +- xml: Check all available schemas when doing upgrades +- Changes to the ACL schema to support nodes and unix groups +- tools: Allow crm_shadow to create older configuration versions +- xml: Prevent use-after-free when comparing two xml documents +- cib: Resolve memory leaks in query paths +- xml: Correctly subtract xml with v1 patchsets +- fencing: Advertise support for reboot/on/off in the metadata for legacy agents +- fencing: default to 'off' when agent does not advertise 'reboot' in metadata +- fencing: Execute all required fencing devices regardless of what topology level they are at +- fencing: Fence using all required devices +- fencing: fixed so that change of could be handled correctly. +- Upstream version cs: 42ae0e3cb50bb9e19dba7d1ad1ea69255bef5370 + +------------------------------------------------------------------- +Wed Apr 16 06:38:45 UTC 2014 - ygao@suse.com + +- pengine: Fix memory leak in expand_tags_in_sets() +- PE: Memory leak +- PE: Do not initiate fencing for unclean nodes when fencing is disabled +- crm_node: Only remove the named resource from the cib +- pengine: Support site-specific instance attributes based on rules (FATE#316118) +- pengine: Ignore failure-timeout only if the failed operation has on-fail="block" (bnc#871175) +- Upstream version cs: f7859e2e06c8cf320482c3e4b447ddbe0a96fe83 + +------------------------------------------------------------------- +Mon Apr 14 06:10:25 UTC 2014 - ygao@suse.com + +- pengine: Support cib object tags (FATE#315101) +- crmd: Correctly detect changes of ticket state (bnc#872794) +- Upstream version cs: 3f7ec44b51825898e3e30784ca4df09e3f45bf40 + +------------------------------------------------------------------- +Fri Apr 11 15:07:26 UTC 2014 - ygao@suse.com + +- Rebase: + * bug-812269_pacemaker-fencing-device-register-messages.patch + +- Build: Update versions in configure.ac and sample spec file +- fencing: Do not unregister/register all stonith devices on every resource agent change +- PE: Unfencing is based on device probes, there is no need to unfence when normal resources are found active +- pengine: handles edge case where container order constraints are not honored during migration +- pengine: Allow container nodes to migrate with connection resource +- xml: Resolve memory leak when logging xml blobs +- PE: Do not unfence nodes that are offline, unclean or shutting down +- PE: Ensure unfencing only happens once, even if the transition is interrupted +- crmd: Actions can only be executed if their pre-requisits completed successfully +- crmd: Do not erase the status section for unfenced nodes +- Fencing: Correctly record which peer performed the fencing operation +- lrmd: Expose logging variables expected by OCF agents +- logging: Simplify processing of logging directives +- logging: daemons always get a log file, unless explicitly set to configured 'none' +- PE: Ensure unfencing occurs before fencing devices are (re-)probed +- fencing: Filter self-fencing at the peers to allow unfencing to work correctly +- fencing: Automatically switch from 'list' to 'status' to 'static-list' if those actions are not advertised in the metadata +- lrmd: Provide stderr output from agents if available, otherwise fall back to stdout +- 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 +- Upstream version cs: ff74a591e670dbdb86f7cddeec989167de521216 + ------------------------------------------------------------------- Wed Apr 9 04:41:38 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 2dee292..bc73141 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -91,11 +91,15 @@ %define with_regression_tests 0 +%if ! %{defined _rundir} +%define _rundir %{_localstatedir}/run +%endif + 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+git20140409.6442c5a +Version: 1.1.11+git20140512.da5aaab Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org @@ -643,7 +647,7 @@ fi %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/cores %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/pengine %dir %attr (750, %{uname}, %{gname}) %{_var}/lib/pacemaker/blackbox -%ghost %dir %attr (750, %{uname}, %{gname}) %{_var}/run/crm +%ghost %dir %attr (750, %{uname}, %{gname}) %{_rundir}/crm %dir /usr/lib/ocf %dir /usr/lib/ocf/resource.d /usr/lib/ocf/resource.d/pacemaker