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

- crmd: Correctly react to successful unfencing operations

Browse Source 
- PE: Delay unfencing until after we know the state of all resources that require unfencing
- PE: Fencing devices default to only requiring quorum in order to start
- PE: Automatically re-unfence a node if the fencing device definition changes
- pengine: Only report 'migrate' in transition summary if migration is actually taking place
- crm_node: Set correct subsystem in node rm cache msg
- crm_node: Prevent use-after-free in tools_remove_node_cache()
- crmd: make resource ID case sensitive
- fencing: Correction of the registration from a difference.
- crm_report: Add support for ISO8601 time format in logs (bnc#870886)
- PE: Potential memory leak
- xml: Support resources that require unfencing
- crmd: make node_state erase correctly
- xml: Add the ability to have lightweight schema revisions
- xml: Split up the RelaxNG schema files so they're easier to version individually
- crm_get_msec: prevent integer overflow
- corosync: Reduce log severity for a redundant message (bnc#870624)
- attrd: Reduce log severity for normal messages (bnc#870624)
- cib: When data was old, it fixed so that the newest cib might not be acquired.
- crm_attribute: Default --lifetime to forever when using --node (bnc#870696)
- Upstream version cs: 76579e813b5aaa1972d400055233519f58bbc0c6

OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=123
This commit is contained in:
Yan Gao 2014-04-08 12:17:12 +00:00 committed by Git OBS Bridge
parent f935b0d20e
commit 5b918bf0b1
7 changed files with 99 additions and 113 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="versionformat">1.1.11+git%cd.%h</param>
<param name="revision">d63eaf41fa8173de3e29873d0461bfb888b83b37</param>
<param name="revision">76579e813b5aaa1972d400055233519f58bbc0c6</param>
</service>
<service name="recompress" mode="disabled">

3
pacemaker-1.1.11+git20140328.d63eaf4.tar.bz2
View File

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

3
pacemaker-1.1.11+git20140404.76579e8.tar.bz2 Normal file
View File

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

26
pacemaker-pengine-nvpair-id-ref-test.patch
View File

@ -1,11 +1,11 @@
commit 8165b88cb8ef05c82631a20c089b64c5ee419ac9
commit 9077dde4ae249fee4cb6e8d3a1d09f45607b1250
Author: Gao,Yan <ygao@suse.com>
Date: Fri Mar 7 16:08:29 2014 +0800
Date: Tue Apr 8 19:41:49 2014 +0800
Test: pengine: Support id-ref in nvpair with optional "name"
diff --git a/pengine/regression.sh b/pengine/regression.sh
index 07c3c35..6c52811 100755
index e436d93..43a9895 100755
--- a/pengine/regression.sh
+++ b/pengine/regression.sh
@@ -93,6 +93,7 @@ do_test params-5 "Params: Restart based on probe digest"
@ -47,7 +47,7 @@ index 0000000..f3aaaa5
+}
diff --git a/pengine/test10/nvpair-id-ref.exp b/pengine/test10/nvpair-id-ref.exp
new file mode 100644
index 0000000..bad4db0
index 0000000..0ad069d
--- /dev/null
+++ b/pengine/test10/nvpair-id-ref.exp
@@ -0,0 +1,135 @@
@ -142,7 +142,7 @@ index 0000000..bad4db0
+ </synapse>
+ <synapse id="8" priority="1000000">
+ <action_set>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
@ -157,7 +157,7 @@ index 0000000..bad4db0
+ </synapse>
+ <synapse id="9" priority="1000000">
+ <action_set>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1">
+ <attributes CRM_meta_op_no_wait="true" />
+ </rsc_op>
+ </action_set>
@ -178,10 +178,10 @@ index 0000000..bad4db0
+ </action_set>
+ <inputs>
+ <trigger>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete-node1" on_node="node1" on_node_uuid="node1"/>
+ </trigger>
+ <trigger>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete-node2" on_node="node2" on_node_uuid="node2"/>
+ </trigger>
+ </inputs>
+ </synapse>
@ -237,11 +237,11 @@ index 0000000..dbe685f
+
diff --git a/pengine/test10/nvpair-id-ref.xml b/pengine/test10/nvpair-id-ref.xml
new file mode 100644
index 0000000..9b3e28f
index 0000000..5580e96
--- /dev/null
+++ b/pengine/test10/nvpair-id-ref.xml
@@ -0,0 +1,56 @@
+<cib epoch="1" num_updates="22" admin_epoch="0" validate-with="pacemaker-1.1" cib-last-written="Fri Jul 13 13:51:21 2012" have-quorum="1">
+<cib epoch="1" num_updates="22" admin_epoch="0" validate-with="pacemaker-1.3" cib-last-written="Fri Jul 13 13:51:21 2012" have-quorum="1">
+ <configuration>
+ <crm_config>
+ <cluster_property_set id="cib-bootstrap-options">
@ -280,8 +280,8 @@ index 0000000..9b3e28f
+ <lrm id="node1">
+ <lrm_resources>
+ <lrm_resource id="rsc_stonith" class="stonith" type="null">
+ <lrm_rsc_op id="rsc_stonith_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.5" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+ <lrm_rsc_op id="rsc_stonith_start_0" operation="start" crm-debug-origin="crm_simulate" crm_feature_set="3.0.5" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="2" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+ <lrm_rsc_op id="rsc_stonith_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.7" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+ <lrm_rsc_op id="rsc_stonith_start_0" operation="start" crm-debug-origin="crm_simulate" crm_feature_set="3.0.7" transition-key="2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:0;2:-1:0:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="2" rc-code="0" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+ </lrm_resource>
+ </lrm_resources>
+ </lrm>
@ -290,7 +290,7 @@ index 0000000..9b3e28f
+ <lrm id="node2">
+ <lrm_resources>
+ <lrm_resource id="rsc_stonith" class="stonith" type="null">
+ <lrm_rsc_op id="rsc_stonith_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.5" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+ <lrm_rsc_op id="rsc_stonith_monitor_0" operation="monitor" crm-debug-origin="crm_simulate" crm_feature_set="3.0.7" transition-key="1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" transition-magic="0:7;1:-1:7:xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx" call-id="1" rc-code="7" op-status="0" interval="0" op-digest="f2317cad3d54cec5d7d7aa7d0bf35cf8"/>
+ </lrm_resource>
+ </lrm_resources>
+ </lrm>

151
pacemaker-pengine-nvpair-id-ref.patch
View File

@ -1,4 +1,4 @@
commit f81b9a3f0eb134df35f1d29742ffe12cbeb74ded
commit 3912538a8954158d44a57f23aa219c5529a170ab
Author: Gao,Yan <ygao@suse.com>
Date: Wed Jan 29 14:07:44 2014 +0800
@ -64,25 +64,29 @@ index f80aa47..626d7b2 100644
}
sorted = g_list_sort(unsorted, sort_pairs);
diff --git a/xml/Makefile.am b/xml/Makefile.am
index 4a7381b..87340fb 100644
--- a/xml/Makefile.am
+++ b/xml/Makefile.am
@@ -26,7 +26,7 @@ RNG_FILES = $(VERSIONED_RNG_FILES:%.rng=%-1.0.rng) \
$(VERSIONED_RNG_FILES:%.rng=%-1.2.rng) \
$(VERSIONED_RNG_FILES:%.rng=%-next.rng) \
pacemaker.rng versions.rng score.rng rule.rng nvset.rng \
- fencing.rng
+ fencing.rng nvset-1.0.rng
EXTRA_DIST = crm-1.0.dtd $(dtd_SCRIPTS)
dtd_SCRIPTS = crm.dtd $(RNG_FILES) upgrade06.xsl upgrade11.xsl crm-transitional.dtd
diff --git a/xml/nvset-1.0.rng b/xml/nvset-1.0.rng
diff --git a/xml/nodes-1.3.rng b/xml/nodes-1.3.rng
index c28b5df..1ded570 100644
--- a/xml/nodes-1.3.rng
+++ b/xml/nodes-1.3.rng
@@ -30,10 +30,10 @@
<zeroOrMore>
<choice>
<element name="instance_attributes">
- <externalRef href="nvset.rng"/>
+ <externalRef href="nvset-1.3.rng"/>
</element>
<element name="utilization">
- <externalRef href="nvset.rng"/>
+ <externalRef href="nvset-1.3.rng"/>
</element>
</choice>
</zeroOrMore>
diff --git a/xml/nvset-1.3.rng b/xml/nvset-1.3.rng
new file mode 100644
index 0000000..0d7e72c
index 0000000..8f1696c
--- /dev/null
+++ b/xml/nvset-1.0.rng
@@ -0,0 +1,35 @@
+++ b/xml/nvset-1.3.rng
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- types: http://www.w3.org/TR/xmlschema-2/#dateTime -->
+<grammar xmlns="http://relaxng.org/ns/structure/1.0"
@ -102,35 +106,6 @@ index 0000000..0d7e72c
+ </optional>
+ <zeroOrMore>
+ <element name="nvpair">
+ <attribute name="id"><data type="ID"/></attribute>
+ <attribute name="name"><text/></attribute>
+ <optional>
+ <attribute name="value"><text/></attribute>
+ </optional>
+ </element>
+ </zeroOrMore>
+ <optional>
+ <externalRef href="score.rng"/>
+ </optional>
+ </interleave>
+ </group>
+ </choice>
+ </define>
+
+</grammar>
diff --git a/xml/nvset.rng b/xml/nvset.rng
index 0d7e72c..8f1696c 100644
--- a/xml/nvset.rng
+++ b/xml/nvset.rng
@@ -17,11 +17,21 @@
</optional>
<zeroOrMore>
<element name="nvpair">
- <attribute name="id"><data type="ID"/></attribute>
- <attribute name="name"><text/></attribute>
- <optional>
- <attribute name="value"><text/></attribute>
- </optional>
+ <choice>
+ <group>
+ <attribute name="id-ref"><data type="IDREF"/></attribute>
@ -146,63 +121,49 @@ index 0d7e72c..8f1696c 100644
+ </optional>
+ </group>
+ </choice>
+ </element>
+ </zeroOrMore>
+ <optional>
+ <externalRef href="score.rng"/>
+ </optional>
+ </interleave>
+ </group>
+ </choice>
+ </define>
+
+</grammar>
diff --git a/xml/resources-1.3.rng b/xml/resources-1.3.rng
index a3640d1..9faf9fc 100644
--- a/xml/resources-1.3.rng
+++ b/xml/resources-1.3.rng
@@ -53,7 +53,7 @@
<ref name="element-operations"/>
<zeroOrMore>
<element name="utilization">
- <externalRef href="nvset.rng"/>
+ <externalRef href="nvset-1.3.rng"/>
</element>
</zeroOrMore>
<optional>
diff --git a/xml/pacemaker-1.0.rng b/xml/pacemaker-1.0.rng
index 7100393..93e5e5f 100644
--- a/xml/pacemaker-1.0.rng
+++ b/xml/pacemaker-1.0.rng
@@ -15,7 +15,7 @@
<element name="crm_config">
<zeroOrMore>
<element name="cluster_property_set">
- <externalRef href="nvset.rng"/>
+ <externalRef href="nvset-1.0.rng"/>
</element>
</zeroOrMore>
</element>
@@ -23,7 +23,7 @@
<element name="rsc_defaults">
<zeroOrMore>
<element name="meta_attributes">
- <externalRef href="nvset.rng"/>
+ <externalRef href="nvset-1.0.rng"/>
</element>
</zeroOrMore>
</zeroOrMore>
</interleave>
@@ -86,7 +86,7 @@
<ref name="element-operations"/>
<zeroOrMore>
<element name="utilization">
- <externalRef href="nvset.rng"/>
+ <externalRef href="nvset-1.3.rng"/>
</element>
@@ -32,7 +32,7 @@
<element name="op_defaults">
<zeroOrMore>
<element name="meta_attributes">
- <externalRef href="nvset.rng"/>
+ <externalRef href="nvset-1.0.rng"/>
</element>
</zeroOrMore>
</element>
@@ -94,7 +94,7 @@
</optional>
<zeroOrMore>
<element name="instance_attributes">
- <externalRef href="nvset.rng"/>
+ <externalRef href="nvset-1.0.rng"/>
</element>
</zeroOrMore>
</element>
diff --git a/xml/resources-1.0.rng b/xml/resources-1.0.rng
index 7ea2228..743ccba 100644
--- a/xml/resources-1.0.rng
+++ b/xml/resources-1.0.rng
@@ -95,10 +95,10 @@
</zeroOrMore>
</interleave>
@@ -144,10 +144,10 @@
<zeroOrMore>
<choice>
<element name="meta_attributes">
- <externalRef href="nvset.rng"/>
+ <externalRef href="nvset-1.0.rng"/>
+ <externalRef href="nvset-1.3.rng"/>
</element>
<element name="instance_attributes">
- <externalRef href="nvset.rng"/>
+ <externalRef href="nvset-1.0.rng"/>
+ <externalRef href="nvset-1.3.rng"/>
</element>
</choice>
</zeroOrMore>

25
pacemaker.changes
View File

@ -1,3 +1,28 @@
-------------------------------------------------------------------
Fri Apr 4 10:46:58 UTC 2014 - ygao@suse.com
- crmd: Correctly react to successful unfencing operations
- PE: Delay unfencing until after we know the state of all resources that require unfencing
- PE: Fencing devices default to only requiring quorum in order to start
- PE: Automatically re-unfence a node if the fencing device definition changes
- pengine: Only report 'migrate' in transition summary if migration is actually taking place
- crm_node: Set correct subsystem in node rm cache msg
- crm_node: Prevent use-after-free in tools_remove_node_cache()
- crmd: make resource ID case sensitive
- fencing: Correction of the registration from a difference.
- crm_report: Add support for ISO8601 time format in logs (bnc#870886)
- PE: Potential memory leak
- xml: Support resources that require unfencing
- crmd: make node_state erase correctly
- xml: Add the ability to have lightweight schema revisions
- xml: Split up the RelaxNG schema files so they're easier to version individually
- crm_get_msec: prevent integer overflow
- corosync: Reduce log severity for a redundant message (bnc#870624)
- attrd: Reduce log severity for normal messages (bnc#870624)
- cib: When data was old, it fixed so that the newest cib might not be acquired.
- crm_attribute: Default --lifetime to forever when using --node (bnc#870696)
- Upstream version cs: 76579e813b5aaa1972d400055233519f58bbc0c6
-------------------------------------------------------------------
Mon Mar 31 07:19:00 UTC 2014 - ygao@suse.com

2
pacemaker.spec
View File

@ -95,7 +95,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+git20140328.d63eaf4
Version: 1.1.11+git20140404.76579e8
Release: 0
#Release: %{pcmk_release}%{?dist}
Url: http://www.clusterlabs.org