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

- Rebase:

Browse Source 
* pacemaker-NodeUtilization-RA.patch
  * pacemaker-colocated-utilization.patch
- xml: Clean up schema list at exit
- 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 <resources> could be handled correctly.
- Upstream version cs: 42ae0e3cb50bb9e19dba7d1ad1ea69255bef5370

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=130
This commit is contained in:
Yan Gao 2014-05-05 09:35:22 +00:00 committed by Git OBS Bridge
parent 1d32640628
commit 3b1daef8d4
7 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -11,7 +11,7 @@
<param name="version">1.1.11</param> <param name="version">1.1.11</param>
--> -->
<param name="versionformat">1.1.11+git%cd.%h</param> <param name="versionformat">1.1.11+git%cd.%h</param>
<param name="revision">f7859e2e06c8cf320482c3e4b447ddbe0a96fe83</param> <param name="revision">42ae0e3cb50bb9e19dba7d1ad1ea69255bef5370</param>
</service> </service>
<service name="recompress" mode="disabled"> <service name="recompress" mode="disabled">

3
pacemaker-1.1.11+git20140415.f7859e2.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78e6d134ff2750aaa91bb4551add0344f094bea8a5c738bd562dca21663e1cff
size 9422160

3
pacemaker-1.1.11+git20140505.42ae0e3.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4cc85b40e123df2acd689817d0157e3016e51aa6506bf921e53fdab86c624c3
size 9384593

2
pacemaker-NodeUtilization-RA.patch
View File

@ -17,7 +17,7 @@ Index: pacemaker/extra/resources/Makefile.am
+ NodeUtilization + NodeUtilization
if BUILD_XML_HELP if BUILD_XML_HELP
man7_MANS = $(ocf_SCRIPTS:%=ocf_pacemaker_%.7)
Index: pacemaker/extra/resources/NodeUtilization Index: pacemaker/extra/resources/NodeUtilization
=================================================================== ===================================================================
--- /dev/null --- /dev/null

8
pacemaker-colocated-utilization.patch
View File

@ -85,9 +85,9 @@ Index: pacemaker/pengine/native.c
}; };
@@ -95,27 +95,119 @@ check_capacity(gpointer key, gpointer va @@ -95,27 +95,119 @@ check_capacity(gpointer key, gpointer va
remaining = crm_parse_int(g_hash_table_lookup(data->node->details->utilization, key), "0"); CRM_ASSERT(data->rsc);
CRM_ASSERT(data->node);
if (required > remaining) {
- pe_rsc_debug(data->rsc, - pe_rsc_debug(data->rsc,
- "Node %s has no enough %s for resource %s: required=%d remaining=%d", - "Node %s has no enough %s for resource %s: required=%d remaining=%d",
- data->node->details->uname, (char *)key, data->rsc->id, required, remaining); - data->node->details->uname, (char *)key, data->rsc->id, required, remaining);
@ -308,9 +308,9 @@ Index: pacemaker/pengine/native.c
struct node_shared_s *details_lh; struct node_shared_s *details_lh;
struct node_shared_s *details_rh; struct node_shared_s *details_rh;
@@ -1550,7 +1690,7 @@ native_rsc_colocation_rh(resource_t * rs @@ -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);
+ filter_results = filter_colocation_constraint(rsc_lh, rsc_rh, constraint, FALSE); + filter_results = filter_colocation_constraint(rsc_lh, rsc_rh, constraint, FALSE);

24
pacemaker.changes
View File

@ -1,3 +1,27 @@
-------------------------------------------------------------------
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 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 <resources> could be handled correctly.
- Upstream version cs: 42ae0e3cb50bb9e19dba7d1ad1ea69255bef5370
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 16 06:38:45 UTC 2014 - ygao@suse.com Wed Apr 16 06:38:45 UTC 2014 - ygao@suse.com

2
pacemaker.spec
View File

@ -95,7 +95,7 @@ Name: pacemaker
Summary: Scalable High-Availability cluster resource manager Summary: Scalable High-Availability cluster resource manager
License: GPL-2.0+ and LGPL-2.1+ License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Clustering/HA Group: Productivity/Clustering/HA
Version: 1.1.11+git20140415.f7859e2 Version: 1.1.11+git20140505.42ae0e3
Release: 0 Release: 0
#Release: %{pcmk_release}%{?dist} #Release: %{pcmk_release}%{?dist}
Url: http://www.clusterlabs.org Url: http://www.clusterlabs.org