From d3e1673ec5c61fe02b6123d66747d981cafcb712c1fa100327dedd401edf3128 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Mon, 3 Mar 2014 06:50:59 +0000 Subject: [PATCH 01/16] Ready to run source service: ca8234daf2bbb2d0fd2fb47cdbb6667f892081bb OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=110 --- _service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_service b/_service index a730e3c..6532f87 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.11 --> 1.1.11+git%cd.%h - 0b7d85a159cc92e00ebded65c9a33edce7ba1c22 + ca8234daf2bbb2d0fd2fb47cdbb6667f892081bb From ecf1558079a92a48163554159e02524fc3003fadee164ab9740c54dc16e1c20f Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Mon, 3 Mar 2014 07:56:37 +0000 Subject: [PATCH 02/16] - xml: Memory leak when free'ing xml documents - systemd: Prevent use-of-NULL when determining if an agent exists - xml: Fix segfault in TRACKING_CHANGES() - PE: Memory leak when updating cancel operations - xml: Prevent memory leak in xml _private field - pengine: Performance increase, stack allocated score2char - crm_report: Only gather dlm data if dlm_controld is running - Fix: memory leak found by valgrind was corrected. - Fencing: Add the ability to call stonith_api_time() from stonith_admin - Fencing: Pass the correct options when looking up the history by node name - cib: Ensure 'cibadmin -R/--replace' commands get replies - xml: Correctly initialize and find v1-style patch version numbers - crm_mon: Add -R switch to show clone details - Build: Install compatibility.h - fencing: Teach stonith-ng about finding device and topology changes in the v2 patch format - crm_report: Additional dlm detail - crm_report: Allow ssh alternatives to be used - crmd: Correctly recognise operation cancellations we initiated - crmd: Improved logging of transition cancellations - crmd: Correctly detect lrm refreshes - crmd: Ignore 'move' operations to the cib, we only care about content changes - PE: Ensure instance numbers are preserved for cloned templates - Bug cl#5196 - PE: Check values after expanding templates - crm_mon: Ensure resource attributes have been unpacked before displaying connectivity data - Upstream version cs: ca8234daf2bbb2d0fd2fb47cdbb6667f892081bb - pengine: Support id-ref in nvpair with optional "name" (FATE#316118) * pacemaker-pengine-nvpair-id-ref.patch * pacemaker-pengine-nvpair-id-ref-test.patch OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=111 --- pacemaker-1.1.11+git20140221.0b7d85a.tar.bz2 | 3 - pacemaker-1.1.11+git20140303.ca8234d.tar.bz2 | 3 + pacemaker-pengine-nvpair-id-ref-test.patch | 299 +++++++++++++++++++ pacemaker-pengine-nvpair-id-ref.patch | 143 +++++++++ pacemaker.changes | 36 +++ pacemaker.spec | 6 +- 6 files changed, 486 insertions(+), 4 deletions(-) delete mode 100644 pacemaker-1.1.11+git20140221.0b7d85a.tar.bz2 create mode 100644 pacemaker-1.1.11+git20140303.ca8234d.tar.bz2 create mode 100644 pacemaker-pengine-nvpair-id-ref-test.patch create mode 100644 pacemaker-pengine-nvpair-id-ref.patch diff --git a/pacemaker-1.1.11+git20140221.0b7d85a.tar.bz2 b/pacemaker-1.1.11+git20140221.0b7d85a.tar.bz2 deleted file mode 100644 index 32fd94f..0000000 --- a/pacemaker-1.1.11+git20140221.0b7d85a.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4209bd9bd0deed4aa6a9254ab2606e18cb9b9b4f31394c96811139a33f977268 -size 9254287 diff --git a/pacemaker-1.1.11+git20140303.ca8234d.tar.bz2 b/pacemaker-1.1.11+git20140303.ca8234d.tar.bz2 new file mode 100644 index 0000000..1d61f15 --- /dev/null +++ b/pacemaker-1.1.11+git20140303.ca8234d.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:236dbbd84ac635a1339439f65f4e92c38762c9fb6b66f26c9a4569208ba8e790 +size 9256516 diff --git a/pacemaker-pengine-nvpair-id-ref-test.patch b/pacemaker-pengine-nvpair-id-ref-test.patch new file mode 100644 index 0000000..0c0ac2c --- /dev/null +++ b/pacemaker-pengine-nvpair-id-ref-test.patch @@ -0,0 +1,299 @@ +commit 74f7c451d7a1f27f3c5a43e81534a20354be1459 +Author: Gao,Yan +Date: Mon Mar 3 14:07:57 2014 +0800 + + Test: pengine: Support id-ref in nvpair with optional "name" for resource instance attributes + +diff --git a/pengine/regression.sh b/pengine/regression.sh +index 07c3c35..9c49c80 100755 +--- a/pengine/regression.sh ++++ b/pengine/regression.sh +@@ -93,6 +93,7 @@ do_test params-5 "Params: Restart based on probe digest" + do_test novell-251689 "Resource definition change + target_role=stopped" + do_test bug-lf-2106 "Restart all anonymous clone instances after config change" + do_test params-6 "Params: Detect reload in previously migrated resource" ++do_test nvpair-id-ref "Support id-ref in nvpair for resource instance attributes" + + echo "" + do_test target-0 "Target Role : baseline" +diff --git a/pengine/test10/nvpair-id-ref.dot b/pengine/test10/nvpair-id-ref.dot +new file mode 100644 +index 0000000..f3aaaa5 +--- /dev/null ++++ b/pengine/test10/nvpair-id-ref.dot +@@ -0,0 +1,23 @@ ++digraph "g" { ++"probe_complete node1" -> "probe_complete" [ style = bold] ++"probe_complete node1" [ style=bold color="green" fontcolor="black"] ++"probe_complete node2" -> "probe_complete" [ style = bold] ++"probe_complete node2" [ style=bold color="green" fontcolor="black"] ++"probe_complete" -> "rsc1_start_0 node2" [ style = bold] ++"probe_complete" -> "rsc2_start_0 node1" [ style = bold] ++"probe_complete" [ style=bold color="green" fontcolor="orange"] ++"rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold] ++"rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black"] ++"rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] ++"rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black"] ++"rsc1_monitor_10000 node2" [ style=bold color="green" fontcolor="black"] ++"rsc1_start_0 node2" -> "rsc1_monitor_10000 node2" [ style = bold] ++"rsc1_start_0 node2" [ style=bold color="green" fontcolor="black"] ++"rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold] ++"rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black"] ++"rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold] ++"rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black"] ++"rsc2_monitor_10000 node1" [ style=bold color="green" fontcolor="black"] ++"rsc2_start_0 node1" -> "rsc2_monitor_10000 node1" [ style = bold] ++"rsc2_start_0 node1" [ style=bold color="green" fontcolor="black"] ++} +diff --git a/pengine/test10/nvpair-id-ref.exp b/pengine/test10/nvpair-id-ref.exp +new file mode 100644 +index 0000000..bad4db0 +--- /dev/null ++++ b/pengine/test10/nvpair-id-ref.exp +@@ -0,0 +1,135 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/pengine/test10/nvpair-id-ref.scores b/pengine/test10/nvpair-id-ref.scores +new file mode 100644 +index 0000000..fb86bf6 +--- /dev/null ++++ b/pengine/test10/nvpair-id-ref.scores +@@ -0,0 +1,7 @@ ++Allocation scores: ++native_color: rsc1 allocation score on node1: 0 ++native_color: rsc1 allocation score on node2: 0 ++native_color: rsc2 allocation score on node1: 0 ++native_color: rsc2 allocation score on node2: 0 ++native_color: rsc_stonith allocation score on node1: 0 ++native_color: rsc_stonith allocation score on node2: 0 +diff --git a/pengine/test10/nvpair-id-ref.summary b/pengine/test10/nvpair-id-ref.summary +new file mode 100644 +index 0000000..dbe685f +--- /dev/null ++++ b/pengine/test10/nvpair-id-ref.summary +@@ -0,0 +1,30 @@ ++ ++Current cluster status: ++Online: [ node1 node2 ] ++ ++ rsc_stonith (stonith:null): Started node1 ++ rsc1 (ocf::pacemaker:Dummy): Stopped ++ rsc2 (ocf::pacemaker:Dummy): Stopped ++ ++Transition Summary: ++ * Start rsc1 (node2) ++ * Start rsc2 (node1) ++ ++Executing cluster transition: ++ * Resource action: rsc1 monitor on node2 ++ * Resource action: rsc1 monitor on node1 ++ * Resource action: rsc2 monitor on node2 ++ * Resource action: rsc2 monitor on node1 ++ * Pseudo action: probe_complete ++ * Resource action: rsc1 start on node2 ++ * Resource action: rsc2 start on node1 ++ * Resource action: rsc1 monitor=10000 on node2 ++ * Resource action: rsc2 monitor=10000 on node1 ++ ++Revised cluster status: ++Online: [ node1 node2 ] ++ ++ rsc_stonith (stonith:null): Started node1 ++ rsc1 (ocf::pacemaker:Dummy): Started node2 ++ rsc2 (ocf::pacemaker:Dummy): Started node1 ++ +diff --git a/pengine/test10/nvpair-id-ref.xml b/pengine/test10/nvpair-id-ref.xml +new file mode 100644 +index 0000000..9b3e28f +--- /dev/null ++++ b/pengine/test10/nvpair-id-ref.xml +@@ -0,0 +1,56 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --git a/pacemaker-pengine-nvpair-id-ref.patch b/pacemaker-pengine-nvpair-id-ref.patch new file mode 100644 index 0000000..24734fc --- /dev/null +++ b/pacemaker-pengine-nvpair-id-ref.patch @@ -0,0 +1,143 @@ +commit 89b75046e67bfe58985a64db4cc29fc6c0784f44 +Author: Gao,Yan +Date: Wed Jan 29 14:07:44 2014 +0800 + + Feature: pengine: Support id-ref in nvpair with optional "name" for resource instance attributes + + If "name" isn't specified, it inherits the name from the referenced + nvpair. + +diff --git a/lib/pengine/rules.c b/lib/pengine/rules.c +index f80aa47..626d7b2 100644 +--- a/lib/pengine/rules.c ++++ b/lib/pengine/rules.c +@@ -607,7 +607,7 @@ sort_pairs(gconstpointer a, gconstpointer b) + } + + static void +-populate_hash(xmlNode * nvpair_list, GHashTable * hash, gboolean overwrite) ++populate_hash(xmlNode * nvpair_list, GHashTable * hash, gboolean overwrite, xmlNode * top) + { + const char *name = NULL; + const char *value = NULL; +@@ -622,10 +622,18 @@ populate_hash(xmlNode * nvpair_list, GHashTable * hash, gboolean overwrite) + + for (an_attr = __xml_first_child(list); an_attr != NULL; an_attr = __xml_next(an_attr)) { + if (crm_str_eq((const char *)an_attr->name, XML_CIB_TAG_NVPAIR, TRUE)) { ++ xmlNode *ref_nvpair = expand_idref(an_attr, top); ++ + name = crm_element_value(an_attr, XML_NVPAIR_ATTR_NAME); ++ if (name == NULL) { ++ name = crm_element_value(ref_nvpair, XML_NVPAIR_ATTR_NAME); ++ } + + crm_trace("Setting attribute: %s", name); + value = crm_element_value(an_attr, XML_NVPAIR_ATTR_VALUE); ++ if (value == NULL) { ++ value = crm_element_value(ref_nvpair, XML_NVPAIR_ATTR_VALUE); ++ } + + if (name == NULL || value == NULL) { + continue; +@@ -657,6 +665,7 @@ struct unpack_data_s { + GHashTable *node_hash; + GHashTable *hash; + crm_time_t *now; ++ xmlNode *top; + }; + + static void +@@ -670,7 +679,7 @@ unpack_attr_set(gpointer data, gpointer user_data) + } + + crm_trace("Adding attributes from %s", pair->name); +- populate_hash(pair->attr_set, unpack_data->hash, unpack_data->overwrite); ++ populate_hash(pair->attr_set, unpack_data->hash, unpack_data->overwrite, unpack_data->top); + } + + void +@@ -717,6 +726,7 @@ unpack_instance_attributes(xmlNode * top, xmlNode * xml_obj, const char *set_nam + data.node_hash = node_hash; + data.now = now; + data.overwrite = overwrite; ++ data.top = top; + } + + sorted = g_list_sort(unsorted, sort_pairs); +diff --git a/xml/Makefile.am b/xml/Makefile.am +index 4a7381b..eb99270 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.1.rng) \ + $(VERSIONED_RNG_FILES:%.rng=%-1.2.rng) \ + pacemaker.rng versions.rng score.rng rule.rng nvset.rng \ +- acls-1.1.rng acls-1.2.rng fencing.rng ++ acls-1.1.rng acls-1.2.rng fencing.rng nvset-nvpair-ref.rng + + EXTRA_DIST = crm-1.0.dtd $(dtd_SCRIPTS) + dtd_SCRIPTS = crm.dtd $(RNG_FILES) upgrade06.xsl crm-transitional.dtd +diff --git a/xml/nvset-nvpair-ref.rng b/xml/nvset-nvpair-ref.rng +new file mode 100644 +index 0000000..8f1696c +--- /dev/null ++++ b/xml/nvset-nvpair-ref.rng +@@ -0,0 +1,45 @@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +diff --git a/xml/resources-1.1.rng b/xml/resources-1.1.rng +index 81a8f82..3eb6824 100644 +--- a/xml/resources-1.1.rng ++++ b/xml/resources-1.1.rng +@@ -145,7 +145,7 @@ + + + +- ++ + + + diff --git a/pacemaker.changes b/pacemaker.changes index 1e36aae..ebaf7f0 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Mon Mar 3 07:40:22 UTC 2014 - ygao@suse.com + +- xml: Memory leak when free'ing xml documents +- systemd: Prevent use-of-NULL when determining if an agent exists +- xml: Fix segfault in TRACKING_CHANGES() +- PE: Memory leak when updating cancel operations +- xml: Prevent memory leak in xml _private field +- pengine: Performance increase, stack allocated score2char +- crm_report: Only gather dlm data if dlm_controld is running +- Fix: memory leak found by valgrind was corrected. +- Fencing: Add the ability to call stonith_api_time() from stonith_admin +- Fencing: Pass the correct options when looking up the history by node name +- cib: Ensure 'cibadmin -R/--replace' commands get replies +- xml: Correctly initialize and find v1-style patch version numbers +- crm_mon: Add -R switch to show clone details +- Build: Install compatibility.h +- fencing: Teach stonith-ng about finding device and topology changes in the v2 patch format +- crm_report: Additional dlm detail +- crm_report: Allow ssh alternatives to be used +- crmd: Correctly recognise operation cancellations we initiated +- crmd: Improved logging of transition cancellations +- crmd: Correctly detect lrm refreshes +- crmd: Ignore 'move' operations to the cib, we only care about content changes +- PE: Ensure instance numbers are preserved for cloned templates +- Bug cl#5196 - PE: Check values after expanding templates +- crm_mon: Ensure resource attributes have been unpacked before displaying connectivity data +- Upstream version cs: ca8234daf2bbb2d0fd2fb47cdbb6667f892081bb + +------------------------------------------------------------------- +Mon Mar 3 06:14:23 UTC 2014 - ygao@suse.com + +- pengine: Support id-ref in nvpair with optional "name" (FATE#316118) + * pacemaker-pengine-nvpair-id-ref.patch + * pacemaker-pengine-nvpair-id-ref-test.patch + ------------------------------------------------------------------- Fri Feb 21 07:05:40 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index c8695a1..f078d26 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -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+git20140221.0b7d85a +Version: 1.1.11+git20140303.ca8234d Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org @@ -112,6 +112,8 @@ Patch5: pacemaker-colocated-utilization.patch Patch6: pacemaker-cibsecret-tool-temp-disabled.patch Patch7: pacemaker-nagios-plugin-dir.patch Patch8: bug-812269_pacemaker-fencing-device-register-messages.patch +Patch9: pacemaker-pengine-nvpair-id-ref.patch +Patch10: pacemaker-pengine-nvpair-id-ref-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: pacemaker-ticket-support = 2.0 Conflicts: heartbeat < 3.0 @@ -397,6 +399,8 @@ manager for Corosync, CMAN and/or Linux-HA. %patch6 -p1 %patch7 -p1 %patch8 -p1 +%patch9 -p1 +%patch10 -p1 # Force the local time # From eed638275efdba1bd90a673ad0b9875867c79e7f0f2948eeb47b0bfa7d521213 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Mon, 3 Mar 2014 09:35:43 +0000 Subject: [PATCH 03/16] - Rebase bug-812269_pacemaker-fencing-device-register-messages.patch OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=112 --- ...ker-fencing-device-register-messages.patch | 20 +++++++++---------- pacemaker.changes | 5 +++++ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/bug-812269_pacemaker-fencing-device-register-messages.patch b/bug-812269_pacemaker-fencing-device-register-messages.patch index fa6cc7e..b7b4aef 100644 --- a/bug-812269_pacemaker-fencing-device-register-messages.patch +++ b/bug-812269_pacemaker-fencing-device-register-messages.patch @@ -4,10 +4,10 @@ Date: Thu Apr 18 16:00:02 2013 +0800 Log: fencing: Drop the severity of the messages on registering a stonith device -Index: pacemaker/fencing/commands.c +Index: pacemaker-1.1.11+git20140303.ca8234d/fencing/commands.c =================================================================== ---- pacemaker.orig/fencing/commands.c -+++ pacemaker/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); @@ -26,16 +26,16 @@ Index: pacemaker/fencing/commands.c g_hash_table_size(device_list)); } if (desc) { -Index: pacemaker/fencing/main.c +Index: pacemaker-1.1.11+git20140303.ca8234d/fencing/main.c =================================================================== ---- pacemaker.orig/fencing/main.c -+++ pacemaker/fencing/main.c -@@ -878,7 +878,7 @@ update_cib_cache_cb(const char *event, x - switch (rc) { +--- pacemaker-1.1.11+git20140303.ca8234d.orig/fencing/main.c ++++ pacemaker-1.1.11+git20140303.ca8234d/fencing/main.c +@@ -981,7 +981,7 @@ update_cib_cache_cb(const char *event, x + break; case -pcmk_err_diff_resync: case -pcmk_err_diff_failed: - crm_notice("[%s] Patch aborted: %s (%d)", event, pcmk_strerror(rc), rc); + crm_info("[%s] Patch aborted: %s (%d)", event, pcmk_strerror(rc), rc); - case pcmk_ok: + free_xml(local_cib); + local_cib = NULL; break; - default: diff --git a/pacemaker.changes b/pacemaker.changes index ebaf7f0..42bc972 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 3 09:32:30 UTC 2014 - ygao@suse.com + +- Rebase bug-812269_pacemaker-fencing-device-register-messages.patch + ------------------------------------------------------------------- Mon Mar 3 07:40:22 UTC 2014 - ygao@suse.com From 0bc48138fd449cd5b4db1d0faa0bd8988b5a40bbec1f50be0f0721f53c061302 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Mon, 3 Mar 2014 10:36:36 +0000 Subject: [PATCH 04/16] Add a bug number: - xml: Fix segfault in TRACKING_CHANGES() (bnc#865345) OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=113 --- pacemaker.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pacemaker.changes b/pacemaker.changes index 42bc972..aa553ad 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -8,7 +8,7 @@ Mon Mar 3 07:40:22 UTC 2014 - ygao@suse.com - xml: Memory leak when free'ing xml documents - systemd: Prevent use-of-NULL when determining if an agent exists -- xml: Fix segfault in TRACKING_CHANGES() +- xml: Fix segfault in TRACKING_CHANGES() (bnc#865345) - PE: Memory leak when updating cancel operations - xml: Prevent memory leak in xml _private field - pengine: Performance increase, stack allocated score2char From e7a395414f8aa1ad5de6b7057946d25630400b18c059da6606b804e82a5febd3 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Mon, 3 Mar 2014 11:51:26 +0000 Subject: [PATCH 05/16] - Add symlinks rcpacemaker and rcpacemaker_remote to /usr/bin/service (bnc#866057) OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=114 --- pacemaker.changes | 5 +++++ pacemaker.spec | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pacemaker.changes b/pacemaker.changes index aa553ad..75ab871 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Mar 3 11:42:04 UTC 2014 - ygao@suse.com + +- Add symlinks rcpacemaker and rcpacemaker_remote to /usr/bin/service (bnc#866057) + ------------------------------------------------------------------- Mon Mar 3 09:32:30 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index f078d26..8823db3 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -487,6 +487,9 @@ rm -f %{buildroot}/%{_libdir}/service_crm.so %if %{defined _unitdir} rm -f %{buildroot}/%{_initrddir}/pacemaker rm -f %{buildroot}/%{_initrddir}/pacemaker_remote + +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcpacemaker +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcpacemaker_remote %endif # Only useful on rhel6 @@ -607,6 +610,7 @@ fi %if %{defined _unitdir} %{_unitdir}/pacemaker.service +%{_sbindir}/rcpacemaker %else %{_initrddir}/pacemaker %endif @@ -721,6 +725,7 @@ fi #%config(noreplace) %{_sysconfdir}/sysconfig/pacemaker %if %{defined _unitdir} %{_unitdir}/pacemaker_remote.service +%{_sbindir}/rcpacemaker_remote %else %{_initrddir}/pacemaker_remote %endif From ceec526574f2145ab638b7dfa0c697d8be6cfbba9cfabf918df0bc37a6baea54 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Thu, 13 Mar 2014 10:26:07 +0000 Subject: [PATCH 06/16] - mainloop: Fixes use after free in process monitor code - lrmd: Cancel recurring operations before stop action is executed - lrmd: Merge duplicate recurring monitor operations - services: Do not allow duplicate recurring op entries - crmd: Ack pending operations that were cancelled due to rsc deletion - crm_mon: Add failures to --as-xml output - cib: Check if on-disk cib is corrupt in the separate on_disk_cib_corrupt() rather than in validate_on_disk_cib() (bnc#866618) - crmd: Do not start timers for already completed operations - acl: Read access must be explicitly granted - xml: Better move detection logic for xml nodes - cib: Do not disable cib disk writes if on-disk cib is corrupt (bnc#866618) - xml: Correctly calculate the adjusted offset of xml elements - crm_diff: Mirror how the cib operates for better testing - cib: Ingore patch failures if we already have their contents - cib: Prevent use-after-free when cleaning up after query operations - xml: Mark the parents of a partial replace as dirty - xml: Correctly enforce ACLs after a replace operation - cib: Do not try to use an empty value for CIB_shadow - crm_resource: Gracefully handle -EACCESS when querying the cib - xml: Correctly observe ACLs when creating filtered copies of xml documents - xml: Only test write permissions for attributes that are being changed - xml: Always allow new scaffolding - node with no attributes or only an id field - cib: Memory leaks caused by ACLs returning filtered copies - xml: Set flags to indicate when updates were rejected by an ACL - cib: Respect the CIB_user environment variable for ACLs - xml: Unpack and apply ACLs when tracking changes - cib: Implement CIB_file-mode ACLs for testing - remote: Enable migration support for baremetal connection resources by default - cibadmin: Allow priviliged clients to perform tasks as unpriviliged users - cibadmin: Remove dangerous commands that exposed unnecessary implementation internal details OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=115 --- _service | 2 +- pacemaker-1.1.11+git20140303.ca8234d.tar.bz2 | 3 -- pacemaker-1.1.11+git20140312.38c5972.tar.bz2 | 3 ++ pacemaker.changes | 47 ++++++++++++++++++++ pacemaker.spec | 2 +- 5 files changed, 52 insertions(+), 5 deletions(-) delete mode 100644 pacemaker-1.1.11+git20140303.ca8234d.tar.bz2 create mode 100644 pacemaker-1.1.11+git20140312.38c5972.tar.bz2 diff --git a/_service b/_service index 6532f87..e02b2d3 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.11 --> 1.1.11+git%cd.%h - ca8234daf2bbb2d0fd2fb47cdbb6667f892081bb + 38c5972cd284ea6627b3309b619dad4d27442ab0 diff --git a/pacemaker-1.1.11+git20140303.ca8234d.tar.bz2 b/pacemaker-1.1.11+git20140303.ca8234d.tar.bz2 deleted file mode 100644 index 1d61f15..0000000 --- a/pacemaker-1.1.11+git20140303.ca8234d.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:236dbbd84ac635a1339439f65f4e92c38762c9fb6b66f26c9a4569208ba8e790 -size 9256516 diff --git a/pacemaker-1.1.11+git20140312.38c5972.tar.bz2 b/pacemaker-1.1.11+git20140312.38c5972.tar.bz2 new file mode 100644 index 0000000..87a48f9 --- /dev/null +++ b/pacemaker-1.1.11+git20140312.38c5972.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa8acee4eb22ba5ca6a8159284f89634c09db83c38d4fb6d296a58c6c1e59214 +size 9271047 diff --git a/pacemaker.changes b/pacemaker.changes index 75ab871..e1055e4 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Thu Mar 13 09:38:46 UTC 2014 - ygao@suse.com + +- mainloop: Fixes use after free in process monitor code +- lrmd: Cancel recurring operations before stop action is executed +- lrmd: Merge duplicate recurring monitor operations +- services: Do not allow duplicate recurring op entries +- crmd: Ack pending operations that were cancelled due to rsc deletion +- crm_mon: Add failures to --as-xml output +- cib: Check if on-disk cib is corrupt in the separate on_disk_cib_corrupt() rather than in validate_on_disk_cib() (bnc#866618) +- crmd: Do not start timers for already completed operations +- acl: Read access must be explicitly granted +- xml: Better move detection logic for xml nodes +- cib: Do not disable cib disk writes if on-disk cib is corrupt (bnc#866618) +- xml: Correctly calculate the adjusted offset of xml elements +- crm_diff: Mirror how the cib operates for better testing +- cib: Ingore patch failures if we already have their contents +- cib: Prevent use-after-free when cleaning up after query operations +- xml: Mark the parents of a partial replace as dirty +- xml: Correctly enforce ACLs after a replace operation +- cib: Do not try to use an empty value for CIB_shadow +- crm_resource: Gracefully handle -EACCESS when querying the cib +- xml: Correctly observe ACLs when creating filtered copies of xml documents +- xml: Only test write permissions for attributes that are being changed +- xml: Always allow new scaffolding - node with no attributes or only an id field +- cib: Memory leaks caused by ACLs returning filtered copies +- xml: Set flags to indicate when updates were rejected by an ACL +- cib: Respect the CIB_user environment variable for ACLs +- xml: Unpack and apply ACLs when tracking changes +- cib: Implement CIB_file-mode ACLs for testing +- remote: Enable migration support for baremetal connection resources by default +- cibadmin: Allow priviliged clients to perform tasks as unpriviliged users +- cibadmin: Remove dangerous commands that exposed unnecessary implementation internal details +- cibadmin: Purge legacy command options deprecated since 2008 to make the short-forms available for new options +- cib: Include a request with file-mode cib actions for the acl code to interrogate +- cib: Switch over completely to the new ACL code +- xml: Allow new objects to be created provided they subseqently match a configured ACL +- cib: Use the new acl filtering functionality +- xml: Support the creation of filtered copies based on ACLs +- xml: Convert all ACLs to xpaths during unpack +- xml: Add ACL flags for xpath selectors when tracking is enabled +- cib: ACL improvements +- cib: Simplify ACL handling for read-only cib queries +- cib: Check ACLs prior to making the update instead of parsing the diff afterwards +- cib: Default ACL support to on +- Upstream version cs: 38c5972cd284ea6627b3309b619dad4d27442ab0 + ------------------------------------------------------------------- Mon Mar 3 11:42:04 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 8823db3..a4d1fec 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -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+git20140303.ca8234d +Version: 1.1.11+git20140312.38c5972 Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org From 280d18b941b167fb744ac048dabe5367dad53cd556b34cdde0461d4f4684e841 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Thu, 13 Mar 2014 10:30:21 +0000 Subject: [PATCH 07/16] Update: pacemaker-pengine-nvpair-id-ref.patch pacemaker-pengine-nvpair-id-ref-test.patch OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=116 --- pacemaker-pengine-nvpair-id-ref-test.patch | 10 +- pacemaker-pengine-nvpair-id-ref.patch | 117 ++++++++++++++++----- 2 files changed, 96 insertions(+), 31 deletions(-) diff --git a/pacemaker-pengine-nvpair-id-ref-test.patch b/pacemaker-pengine-nvpair-id-ref-test.patch index 0c0ac2c..7b3e288 100644 --- a/pacemaker-pengine-nvpair-id-ref-test.patch +++ b/pacemaker-pengine-nvpair-id-ref-test.patch @@ -1,18 +1,18 @@ -commit 74f7c451d7a1f27f3c5a43e81534a20354be1459 +commit 8165b88cb8ef05c82631a20c089b64c5ee419ac9 Author: Gao,Yan -Date: Mon Mar 3 14:07:57 2014 +0800 +Date: Fri Mar 7 16:08:29 2014 +0800 - Test: pengine: Support id-ref in nvpair with optional "name" for resource instance attributes + Test: pengine: Support id-ref in nvpair with optional "name" diff --git a/pengine/regression.sh b/pengine/regression.sh -index 07c3c35..9c49c80 100755 +index 07c3c35..6c52811 100755 --- a/pengine/regression.sh +++ b/pengine/regression.sh @@ -93,6 +93,7 @@ do_test params-5 "Params: Restart based on probe digest" do_test novell-251689 "Resource definition change + target_role=stopped" do_test bug-lf-2106 "Restart all anonymous clone instances after config change" do_test params-6 "Params: Detect reload in previously migrated resource" -+do_test nvpair-id-ref "Support id-ref in nvpair for resource instance attributes" ++do_test nvpair-id-ref "Support id-ref in nvpair with optional name" echo "" do_test target-0 "Target Role : baseline" diff --git a/pacemaker-pengine-nvpair-id-ref.patch b/pacemaker-pengine-nvpair-id-ref.patch index 24734fc..a49b7ad 100644 --- a/pacemaker-pengine-nvpair-id-ref.patch +++ b/pacemaker-pengine-nvpair-id-ref.patch @@ -1,8 +1,8 @@ -commit 89b75046e67bfe58985a64db4cc29fc6c0784f44 +commit f81b9a3f0eb134df35f1d29742ffe12cbeb74ded Author: Gao,Yan Date: Wed Jan 29 14:07:44 2014 +0800 - Feature: pengine: Support id-ref in nvpair with optional "name" for resource instance attributes + Feature: pengine: Support id-ref in nvpair with optional "name" If "name" isn't specified, it inherits the name from the referenced nvpair. @@ -65,7 +65,7 @@ index f80aa47..626d7b2 100644 sorted = g_list_sort(unsorted, sort_pairs); diff --git a/xml/Makefile.am b/xml/Makefile.am -index 4a7381b..eb99270 100644 +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) \ @@ -73,16 +73,16 @@ index 4a7381b..eb99270 100644 $(VERSIONED_RNG_FILES:%.rng=%-1.2.rng) \ pacemaker.rng versions.rng score.rng rule.rng nvset.rng \ - acls-1.1.rng acls-1.2.rng fencing.rng -+ acls-1.1.rng acls-1.2.rng fencing.rng nvset-nvpair-ref.rng ++ acls-1.1.rng acls-1.2.rng fencing.rng nvset-1.0.rng EXTRA_DIST = crm-1.0.dtd $(dtd_SCRIPTS) dtd_SCRIPTS = crm.dtd $(RNG_FILES) upgrade06.xsl crm-transitional.dtd -diff --git a/xml/nvset-nvpair-ref.rng b/xml/nvset-nvpair-ref.rng +diff --git a/xml/nvset-1.0.rng b/xml/nvset-1.0.rng new file mode 100644 -index 0000000..8f1696c +index 0000000..0d7e72c --- /dev/null -+++ b/xml/nvset-nvpair-ref.rng -@@ -0,0 +1,45 @@ ++++ b/xml/nvset-1.0.rng +@@ -0,0 +1,35 @@ + + + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +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 @@ + + + +- +- +- +- +- + + + @@ -117,27 +146,63 @@ index 0000000..8f1696c + + + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/xml/resources-1.1.rng b/xml/resources-1.1.rng -index 81a8f82..3eb6824 100644 ---- a/xml/resources-1.1.rng -+++ b/xml/resources-1.1.rng -@@ -145,7 +145,7 @@ - + + + +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 @@ + + + +- ++ + + + +@@ -23,7 +23,7 @@ + + + +- ++ + + + +@@ -32,7 +32,7 @@ + + + +- ++ + + + +@@ -94,7 +94,7 @@ + + + +- ++ + + + +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 @@ + + + +- ++ - -+ ++ From 90a1b0231eb455f2d4e756e55b010bb3c6365c9da368cc40f13b026416bd2c89 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Thu, 13 Mar 2014 10:51:32 +0000 Subject: [PATCH 08/16] - Drop obsolete bug-792124_pacemaker-stonith-monitor-log.patch OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=117 --- ...792124_pacemaker-stonith-monitor-log.patch | 72 ------------------- pacemaker.changes | 5 ++ pacemaker.spec | 16 ++--- 3 files changed, 12 insertions(+), 81 deletions(-) delete mode 100644 bug-792124_pacemaker-stonith-monitor-log.patch diff --git a/bug-792124_pacemaker-stonith-monitor-log.patch b/bug-792124_pacemaker-stonith-monitor-log.patch deleted file mode 100644 index 752eaaa..0000000 --- a/bug-792124_pacemaker-stonith-monitor-log.patch +++ /dev/null @@ -1,72 +0,0 @@ -commit c9765144c0c23808b37adaf56c3305e2e2167173 -Author: Gao,Yan -Date: Mon Dec 17 16:09:28 2012 +0800 - - Low: fencing: Suppress logging for stonith monitor actions (bnc#792124) - -Index: pacemaker/fencing/commands.c -=================================================================== ---- pacemaker.orig/fencing/commands.c -+++ pacemaker/fencing/commands.c -@@ -1296,7 +1296,13 @@ log_operation(async_command_t * cmd, int - /* Logging the whole string confuses syslog when the string is xml */ - char *prefix = g_strdup_printf("%s:%d", cmd->device, pid); - -- crm_log_output(rc == 0 ? LOG_INFO : LOG_WARNING, prefix, output); -+ int success_log_level = LOG_INFO; -+ -+ if (safe_str_eq(cmd->action, "monitor") || -+ safe_str_eq(cmd->action, "status")) { -+ success_log_level = LOG_DEBUG; -+ } -+ crm_log_output(rc==0?success_log_level:LOG_WARNING, prefix, output); - g_free(prefix); - } - } -@@ -1954,6 +1960,7 @@ stonith_command(crm_client_t * client, u - * by 0x40AD4F: stonith_command (commands.c:1891) - * - */ -+ int error_log_level = LOG_INFO; - - if (get_xpath_object("//" T_STONITH_REPLY, request, LOG_DEBUG_3)) { - is_reply = TRUE; -@@ -1973,7 +1980,16 @@ stonith_command(crm_client_t * client, u - rc = handle_request(client, id, flags, request, remote_peer); - } - -- do_crm_log_unlikely(rc > 0 ? LOG_DEBUG : LOG_INFO, "Processed %s%s from %s: %s (%d)", op, -+ if (rc == -EINPROGRESS) { -+ xmlNode *op = get_xpath_object("//@"F_STONITH_ACTION, request, LOG_DEBUG_3); -+ const char *action = crm_element_value(op, F_STONITH_ACTION); -+ -+ if (safe_str_eq(action, "monitor") || -+ safe_str_eq(action, "status")) { -+ error_log_level = LOG_DEBUG; -+ } -+ } -+ do_crm_log_unlikely(rc > 0 ? LOG_DEBUG : error_log_level, "Processed %s%s from %s: %s (%d)", op, - is_reply ? " reply" : "", client ? client->name : remote_peer, - rc > 0 ? "" : pcmk_strerror(rc), rc); - -Index: pacemaker/lib/fencing/st_client.c -=================================================================== ---- pacemaker.orig/lib/fencing/st_client.c -+++ pacemaker/lib/fencing/st_client.c -@@ -561,8 +561,15 @@ stonith_action_create(const char *agent, - { - stonith_action_t *action; - -+ int log_level = LOG_INFO; -+ -+ if (safe_str_eq(_action, "monitor") || -+ safe_str_eq(_action, "status")) { -+ log_level = LOG_DEBUG; -+ } -+ - action = calloc(1, sizeof(stonith_action_t)); -- crm_info("Initiating action %s for agent %s (target=%s)", _action, agent, victim); -+ do_crm_log(log_level, "Initiating action %s for agent %s (target=%s)", _action, agent, victim); - action->args = make_args(_action, victim, victim_nodeid, device_args, port_map); - action->agent = strdup(agent); - action->action = strdup(_action); diff --git a/pacemaker.changes b/pacemaker.changes index e1055e4..6513edf 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Mar 13 10:44:49 UTC 2014 - ygao@suse.com + +- Drop obsolete bug-792124_pacemaker-stonith-monitor-log.patch + ------------------------------------------------------------------- Thu Mar 13 09:38:46 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index a4d1fec..9388710 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -106,14 +106,13 @@ Source0: %{name}-%{version}.tar.bz2 Source100: pacemaker.rpmlintrc Patch1: bug-806256_pacemaker-log-level-notice.patch Patch2: bug-728579_pacemaker-stonith-dev-id.patch -Patch3: bug-792124_pacemaker-stonith-monitor-log.patch -Patch4: pacemaker-NodeUtilization-RA.patch -Patch5: pacemaker-colocated-utilization.patch -Patch6: pacemaker-cibsecret-tool-temp-disabled.patch -Patch7: pacemaker-nagios-plugin-dir.patch -Patch8: bug-812269_pacemaker-fencing-device-register-messages.patch -Patch9: pacemaker-pengine-nvpair-id-ref.patch -Patch10: pacemaker-pengine-nvpair-id-ref-test.patch +Patch3: pacemaker-NodeUtilization-RA.patch +Patch4: pacemaker-colocated-utilization.patch +Patch5: pacemaker-cibsecret-tool-temp-disabled.patch +Patch6: pacemaker-nagios-plugin-dir.patch +Patch7: bug-812269_pacemaker-fencing-device-register-messages.patch +Patch8: pacemaker-pengine-nvpair-id-ref.patch +Patch9: pacemaker-pengine-nvpair-id-ref-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: pacemaker-ticket-support = 2.0 Conflicts: heartbeat < 3.0 @@ -400,7 +399,6 @@ manager for Corosync, CMAN and/or Linux-HA. %patch7 -p1 %patch8 -p1 %patch9 -p1 -%patch10 -p1 # Force the local time # From 46c0afaaa43a06e04ea0d90b50d40a97cfb12e97613422da6f56a546fc9dea4c Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Thu, 13 Mar 2014 13:08:11 +0000 Subject: [PATCH 09/16] Tweak of pacemaker.changes OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=118 --- pacemaker.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pacemaker.changes b/pacemaker.changes index 6513edf..6ede046 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -94,7 +94,7 @@ Mon Mar 3 06:14:23 UTC 2014 - ygao@suse.com - pengine: Support id-ref in nvpair with optional "name" (FATE#316118) * pacemaker-pengine-nvpair-id-ref.patch - * pacemaker-pengine-nvpair-id-ref-test.patch + * pacemaker-pengine-nvpair-id-ref-test.patch ------------------------------------------------------------------- Fri Feb 21 07:05:40 UTC 2014 - ygao@suse.com From 417c1ff4b9b67beee9a3ba8c4c36e132533d36264264d00edc503778dfcaa074 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Fri, 21 Mar 2014 05:57:18 +0000 Subject: [PATCH 10/16] - pengine: fixes invalid transition caused by clones with more than 10 instances - services_action_cancel: Interpret return code from mainloop_child_kill() correctly - fencing: make hashtable mapping hostname->alias case insensitive for hostname - attrd: Make hostname hashtable case insensitive - membership: make caching peers by uname case insensitive - crmd: make lrm_state hash table not case sensitive - lrmd: clean up the agent's entire process group - xml: Enable resource sets in location constraints for 1.2 schema (bnc#867880) - Upstream version cs: 8bee850bb95ee01dcba03038ddfd65d22e195cf6 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=119 --- _service | 2 +- pacemaker-1.1.11+git20140312.38c5972.tar.bz2 | 3 --- pacemaker-1.1.11+git20140320.8bee850.tar.bz2 | 3 +++ pacemaker.changes | 13 +++++++++++++ pacemaker.spec | 2 +- 5 files changed, 18 insertions(+), 5 deletions(-) delete mode 100644 pacemaker-1.1.11+git20140312.38c5972.tar.bz2 create mode 100644 pacemaker-1.1.11+git20140320.8bee850.tar.bz2 diff --git a/_service b/_service index e02b2d3..e13064c 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.11 --> 1.1.11+git%cd.%h - 38c5972cd284ea6627b3309b619dad4d27442ab0 + 8bee850bb95ee01dcba03038ddfd65d22e195cf6 diff --git a/pacemaker-1.1.11+git20140312.38c5972.tar.bz2 b/pacemaker-1.1.11+git20140312.38c5972.tar.bz2 deleted file mode 100644 index 87a48f9..0000000 --- a/pacemaker-1.1.11+git20140312.38c5972.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fa8acee4eb22ba5ca6a8159284f89634c09db83c38d4fb6d296a58c6c1e59214 -size 9271047 diff --git a/pacemaker-1.1.11+git20140320.8bee850.tar.bz2 b/pacemaker-1.1.11+git20140320.8bee850.tar.bz2 new file mode 100644 index 0000000..7bdfbf9 --- /dev/null +++ b/pacemaker-1.1.11+git20140320.8bee850.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5ad946b17aa47ca067daffa1e050d663b74c08ba87cdef00d9106e28049ae791 +size 9367967 diff --git a/pacemaker.changes b/pacemaker.changes index 6ede046..b333349 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Mar 21 05:51:05 UTC 2014 - ygao@suse.com + +- pengine: fixes invalid transition caused by clones with more than 10 instances +- services_action_cancel: Interpret return code from mainloop_child_kill() correctly +- fencing: make hashtable mapping hostname->alias case insensitive for hostname +- attrd: Make hostname hashtable case insensitive +- membership: make caching peers by uname case insensitive +- crmd: make lrm_state hash table not case sensitive +- lrmd: clean up the agent's entire process group +- xml: Enable resource sets in location constraints for 1.2 schema (bnc#867880) +- Upstream version cs: 8bee850bb95ee01dcba03038ddfd65d22e195cf6 + ------------------------------------------------------------------- Thu Mar 13 10:44:49 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 9388710..bd4c3fb 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -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+git20140312.38c5972 +Version: 1.1.11+git20140320.8bee850 Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org From ea9f8158b26c4db032cc9803b235e36c5cc7b9e9d4e6bf83d9ef02f27d9b80db Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Fri, 28 Mar 2014 07:56:30 +0000 Subject: [PATCH 11/16] - xml: Allow first-acl-match-wins semantics to be supported if desired - crm_report: extract additional DLM lockspace data - xml: If validate-with is missing, we find the most recent schema that accepts it and go from there - tools: fix "crm_shadow --reset " - controld: Remove '-q 0' from default dlm_controld arguments - acl: Authenticate pacemaker-remote requests with the node name as the client - controld: Verify killall is available on resource start - Prevent use-of-NULL spotted by coverity - crmd: Correctly detect changes to the configuration root - crmd: Fenced nodes that return prior to an election do not need to have their status section reset - xml: Do not log deleted attributes - xml: Correctly mark the parent's of deleted attributes as dirty - crm_diff: Allow the generation of xml patchsets without digests - crmd: Prevent memory leak when accepting a new DC - xml: Find the minimal set of changes when part of a document is replaced - xml: Create the correct diff when only part of a document is changed - Upstream version cs: 61e95e4864be0301be528874eed65266f4e62cf0 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=120 --- _service | 2 +- pacemaker-1.1.11+git20140320.8bee850.tar.bz2 | 3 --- pacemaker-1.1.11+git20140328.61e95e4.tar.bz2 | 3 +++ pacemaker.changes | 21 ++++++++++++++++++++ pacemaker.spec | 2 +- 5 files changed, 26 insertions(+), 5 deletions(-) delete mode 100644 pacemaker-1.1.11+git20140320.8bee850.tar.bz2 create mode 100644 pacemaker-1.1.11+git20140328.61e95e4.tar.bz2 diff --git a/_service b/_service index e13064c..646a08a 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.11 --> 1.1.11+git%cd.%h - 8bee850bb95ee01dcba03038ddfd65d22e195cf6 + 61e95e4864be0301be528874eed65266f4e62cf0 diff --git a/pacemaker-1.1.11+git20140320.8bee850.tar.bz2 b/pacemaker-1.1.11+git20140320.8bee850.tar.bz2 deleted file mode 100644 index 7bdfbf9..0000000 --- a/pacemaker-1.1.11+git20140320.8bee850.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5ad946b17aa47ca067daffa1e050d663b74c08ba87cdef00d9106e28049ae791 -size 9367967 diff --git a/pacemaker-1.1.11+git20140328.61e95e4.tar.bz2 b/pacemaker-1.1.11+git20140328.61e95e4.tar.bz2 new file mode 100644 index 0000000..bcbc7f9 --- /dev/null +++ b/pacemaker-1.1.11+git20140328.61e95e4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:46d9518258f0535c303e1ae8035387d207dd7fe272c0d1f095ca5307868d9b6b +size 9337949 diff --git a/pacemaker.changes b/pacemaker.changes index b333349..cad672c 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Mar 28 07:52:07 UTC 2014 - ygao@suse.com + +- xml: Allow first-acl-match-wins semantics to be supported if desired +- crm_report: extract additional DLM lockspace data +- xml: If validate-with is missing, we find the most recent schema that accepts it and go from there +- tools: fix "crm_shadow --reset " +- controld: Remove '-q 0' from default dlm_controld arguments +- acl: Authenticate pacemaker-remote requests with the node name as the client +- controld: Verify killall is available on resource start +- Prevent use-of-NULL spotted by coverity +- crmd: Correctly detect changes to the configuration root +- crmd: Fenced nodes that return prior to an election do not need to have their status section reset +- xml: Do not log deleted attributes +- xml: Correctly mark the parent's of deleted attributes as dirty +- crm_diff: Allow the generation of xml patchsets without digests +- crmd: Prevent memory leak when accepting a new DC +- xml: Find the minimal set of changes when part of a document is replaced +- xml: Create the correct diff when only part of a document is changed +- Upstream version cs: 61e95e4864be0301be528874eed65266f4e62cf0 + ------------------------------------------------------------------- Fri Mar 21 05:51:05 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index bd4c3fb..8fa3c22 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -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+git20140320.8bee850 +Version: 1.1.11+git20140328.61e95e4 Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org From f003975b5dbf0538915e17fcc93f978417ee83ebcd8010e67ec9ab22965acba9 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Mon, 31 Mar 2014 07:27:41 +0000 Subject: [PATCH 12/16] - pengine: Do not fence remote-node entries left over in the node section that have no connection rsc - pengine: properly handle remote-node without connection resource. - xml: Update xml validation to allow '' - cib: allow setting permanent remote-node attributes - Upstream version cs: d63eaf41fa8173de3e29873d0461bfb888b83b37 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=121 --- _service | 2 +- pacemaker-1.1.11+git20140328.61e95e4.tar.bz2 | 3 --- pacemaker-1.1.11+git20140328.d63eaf4.tar.bz2 | 3 +++ pacemaker.changes | 9 +++++++++ pacemaker.spec | 2 +- 5 files changed, 14 insertions(+), 5 deletions(-) delete mode 100644 pacemaker-1.1.11+git20140328.61e95e4.tar.bz2 create mode 100644 pacemaker-1.1.11+git20140328.d63eaf4.tar.bz2 diff --git a/_service b/_service index 646a08a..1e94a79 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.11 --> 1.1.11+git%cd.%h - 61e95e4864be0301be528874eed65266f4e62cf0 + d63eaf41fa8173de3e29873d0461bfb888b83b37 diff --git a/pacemaker-1.1.11+git20140328.61e95e4.tar.bz2 b/pacemaker-1.1.11+git20140328.61e95e4.tar.bz2 deleted file mode 100644 index bcbc7f9..0000000 --- a/pacemaker-1.1.11+git20140328.61e95e4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:46d9518258f0535c303e1ae8035387d207dd7fe272c0d1f095ca5307868d9b6b -size 9337949 diff --git a/pacemaker-1.1.11+git20140328.d63eaf4.tar.bz2 b/pacemaker-1.1.11+git20140328.d63eaf4.tar.bz2 new file mode 100644 index 0000000..5b9407f --- /dev/null +++ b/pacemaker-1.1.11+git20140328.d63eaf4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ef19e4dd66153e27c3ff5c1a461724783af84c9c599bac19ab557dc8f8e7a20 +size 9369566 diff --git a/pacemaker.changes b/pacemaker.changes index cad672c..2d1d41d 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Mar 31 07:19:00 UTC 2014 - ygao@suse.com + +- pengine: Do not fence remote-node entries left over in the node section that have no connection rsc +- pengine: properly handle remote-node without connection resource. +- xml: Update xml validation to allow '' +- cib: allow setting permanent remote-node attributes +- Upstream version cs: d63eaf41fa8173de3e29873d0461bfb888b83b37 + ------------------------------------------------------------------- Fri Mar 28 07:52:07 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 8fa3c22..e9a8e99 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -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.61e95e4 +Version: 1.1.11+git20140328.d63eaf4 Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org From f935b0d20e09476d278a518690e465de06c58fb4949e6e01bb39c01594a3a72c Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Mon, 31 Mar 2014 09:06:35 +0000 Subject: [PATCH 13/16] Rebase pacemaker-pengine-nvpair-id-ref.patch OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=122 --- pacemaker-pengine-nvpair-id-ref.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pacemaker-pengine-nvpair-id-ref.patch b/pacemaker-pengine-nvpair-id-ref.patch index a49b7ad..19ab147 100644 --- a/pacemaker-pengine-nvpair-id-ref.patch +++ b/pacemaker-pengine-nvpair-id-ref.patch @@ -69,14 +69,14 @@ 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.1.rng) \ $(VERSIONED_RNG_FILES:%.rng=%-1.2.rng) \ + $(VERSIONED_RNG_FILES:%.rng=%-next.rng) \ pacemaker.rng versions.rng score.rng rule.rng nvset.rng \ -- acls-1.1.rng acls-1.2.rng fencing.rng -+ acls-1.1.rng acls-1.2.rng fencing.rng nvset-1.0.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 crm-transitional.dtd + 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 new file mode 100644 index 0000000..0d7e72c From 5b918bf0b18a07717d6a165d36939b9a00ad637661161442f5a3bbad6d49b084 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Tue, 8 Apr 2014 12:17:12 +0000 Subject: [PATCH 14/16] - 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 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=123 --- _service | 2 +- pacemaker-1.1.11+git20140328.d63eaf4.tar.bz2 | 3 - pacemaker-1.1.11+git20140404.76579e8.tar.bz2 | 3 + pacemaker-pengine-nvpair-id-ref-test.patch | 26 ++-- pacemaker-pengine-nvpair-id-ref.patch | 151 +++++++------------ pacemaker.changes | 25 +++ pacemaker.spec | 2 +- 7 files changed, 99 insertions(+), 113 deletions(-) delete mode 100644 pacemaker-1.1.11+git20140328.d63eaf4.tar.bz2 create mode 100644 pacemaker-1.1.11+git20140404.76579e8.tar.bz2 diff --git a/_service b/_service index 1e94a79..f6ece4d 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.11 --> 1.1.11+git%cd.%h - d63eaf41fa8173de3e29873d0461bfb888b83b37 + 76579e813b5aaa1972d400055233519f58bbc0c6 diff --git a/pacemaker-1.1.11+git20140328.d63eaf4.tar.bz2 b/pacemaker-1.1.11+git20140328.d63eaf4.tar.bz2 deleted file mode 100644 index 5b9407f..0000000 --- a/pacemaker-1.1.11+git20140328.d63eaf4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ef19e4dd66153e27c3ff5c1a461724783af84c9c599bac19ab557dc8f8e7a20 -size 9369566 diff --git a/pacemaker-1.1.11+git20140404.76579e8.tar.bz2 b/pacemaker-1.1.11+git20140404.76579e8.tar.bz2 new file mode 100644 index 0000000..4b5d52d --- /dev/null +++ b/pacemaker-1.1.11+git20140404.76579e8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e4d65215d2f953f8b55af918ebfb716d301fadc2351717a6aecc5e9e169768a9 +size 9433858 diff --git a/pacemaker-pengine-nvpair-id-ref-test.patch b/pacemaker-pengine-nvpair-id-ref-test.patch index 7b3e288..bf079ce 100644 --- a/pacemaker-pengine-nvpair-id-ref-test.patch +++ b/pacemaker-pengine-nvpair-id-ref-test.patch @@ -1,11 +1,11 @@ -commit 8165b88cb8ef05c82631a20c089b64c5ee419ac9 +commit 9077dde4ae249fee4cb6e8d3a1d09f45607b1250 Author: Gao,Yan -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 + + + -+ ++ + + + @@ -157,7 +157,7 @@ index 0000000..bad4db0 + + + -+ ++ + + + @@ -178,10 +178,10 @@ index 0000000..bad4db0 + + + -+ ++ + + -+ ++ + + + @@ -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 @@ -+ ++ + + + @@ -280,8 +280,8 @@ index 0000000..9b3e28f + + + -+ -+ ++ ++ + + + @@ -290,7 +290,7 @@ index 0000000..9b3e28f + + + -+ ++ + + + diff --git a/pacemaker-pengine-nvpair-id-ref.patch b/pacemaker-pengine-nvpair-id-ref.patch index 19ab147..f28a7d6 100644 --- a/pacemaker-pengine-nvpair-id-ref.patch +++ b/pacemaker-pengine-nvpair-id-ref.patch @@ -1,4 +1,4 @@ -commit f81b9a3f0eb134df35f1d29742ffe12cbeb74ded +commit 3912538a8954158d44a57f23aa219c5529a170ab Author: Gao,Yan 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 @@ + + + +- ++ + + +- ++ + + + +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 @@ + + + + + -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -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 @@ - - - -- -- -- -- -- + + + @@ -146,63 +121,49 @@ index 0d7e72c..8f1696c 100644 + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ +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 @@ + + + +- ++ - - -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 @@ - - - -- -+ - - - -@@ -23,7 +23,7 @@ - - - -- -+ - - + + +@@ -86,7 +86,7 @@ + + + +- ++ -@@ -32,7 +32,7 @@ - - - -- -+ - - - -@@ -94,7 +94,7 @@ - - - -- -+ - - - -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 @@ + + +@@ -144,10 +144,10 @@ - -+ ++ - -+ ++ diff --git a/pacemaker.changes b/pacemaker.changes index 2d1d41d..e3bb075 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -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 diff --git a/pacemaker.spec b/pacemaker.spec index e9a8e99..8e558ad 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -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 From 26bd423afff866b16e445a0aea3ff3de28dd87820238d7372472948820729003 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Tue, 8 Apr 2014 13:46:29 +0000 Subject: [PATCH 15/16] - xml: INFINITY could overflow for 16-bit ints - explicitly cast it - xml: Correctly determine the lowest allowed schema version - xml: Construct the table of supported schemas - cib: All schema upgrade requests must go via the DC - cib: Determine the best value of validate-with if one is not supplied - acl: Ensure known users are not able to read the cib by default - xml: Add missing schema file - Upstream version cs: d9fbba56804a7a7bcceaa5d4b7e29e3f15fc0e59 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=124 --- _service | 2 +- pacemaker-1.1.11+git20140404.76579e8.tar.bz2 | 3 --- pacemaker-1.1.11+git20140408.d9fbba5.tar.bz2 | 3 +++ pacemaker.changes | 12 ++++++++++++ pacemaker.spec | 2 +- 5 files changed, 17 insertions(+), 5 deletions(-) delete mode 100644 pacemaker-1.1.11+git20140404.76579e8.tar.bz2 create mode 100644 pacemaker-1.1.11+git20140408.d9fbba5.tar.bz2 diff --git a/_service b/_service index f6ece4d..45ca833 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.11 --> 1.1.11+git%cd.%h - 76579e813b5aaa1972d400055233519f58bbc0c6 + d9fbba56804a7a7bcceaa5d4b7e29e3f15fc0e59 diff --git a/pacemaker-1.1.11+git20140404.76579e8.tar.bz2 b/pacemaker-1.1.11+git20140404.76579e8.tar.bz2 deleted file mode 100644 index 4b5d52d..0000000 --- a/pacemaker-1.1.11+git20140404.76579e8.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e4d65215d2f953f8b55af918ebfb716d301fadc2351717a6aecc5e9e169768a9 -size 9433858 diff --git a/pacemaker-1.1.11+git20140408.d9fbba5.tar.bz2 b/pacemaker-1.1.11+git20140408.d9fbba5.tar.bz2 new file mode 100644 index 0000000..9e08756 --- /dev/null +++ b/pacemaker-1.1.11+git20140408.d9fbba5.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7a8b6f8aea3b0ba4e27778358871643c9b0af410b0ce40fcd09604eca77cb32b +size 9436232 diff --git a/pacemaker.changes b/pacemaker.changes index e3bb075..97012b1 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Apr 8 13:34:59 UTC 2014 - ygao@suse.com + +- xml: INFINITY could overflow for 16-bit ints - explicitly cast it +- xml: Correctly determine the lowest allowed schema version +- xml: Construct the table of supported schemas +- cib: All schema upgrade requests must go via the DC +- cib: Determine the best value of validate-with if one is not supplied +- acl: Ensure known users are not able to read the cib by default +- xml: Add missing schema file +- Upstream version cs: d9fbba56804a7a7bcceaa5d4b7e29e3f15fc0e59 + ------------------------------------------------------------------- Fri Apr 4 10:46:58 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 8e558ad..a728052 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -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+git20140404.76579e8 +Version: 1.1.11+git20140408.d9fbba5 Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org From 5f64fb1200345f064c0cf1cef2044ae8b9dd943a6c3419aafdf42d362c9e5084 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Wed, 9 Apr 2014 04:54:43 +0000 Subject: [PATCH 16/16] - pengine: Support id-ref in nvpair with optional "name" (FATE#316118) Drop the patches that have been merged upstream: * pacemaker-pengine-nvpair-id-ref.patch * pacemaker-pengine-nvpair-id-ref-test.patch - Upstream version cs: 6442c5a67cdd4cbaeedb2c532e0dc0667a79c202 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=125 --- _service | 2 +- pacemaker-1.1.11+git20140408.d9fbba5.tar.bz2 | 3 - pacemaker-1.1.11+git20140409.6442c5a.tar.bz2 | 3 + pacemaker-pengine-nvpair-id-ref-test.patch | 299 ------------------- pacemaker-pengine-nvpair-id-ref.patch | 169 ----------- pacemaker.changes | 9 + pacemaker.spec | 6 +- 7 files changed, 14 insertions(+), 477 deletions(-) delete mode 100644 pacemaker-1.1.11+git20140408.d9fbba5.tar.bz2 create mode 100644 pacemaker-1.1.11+git20140409.6442c5a.tar.bz2 delete mode 100644 pacemaker-pengine-nvpair-id-ref-test.patch delete mode 100644 pacemaker-pengine-nvpair-id-ref.patch diff --git a/_service b/_service index 45ca833..01ec0a9 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.11 --> 1.1.11+git%cd.%h - d9fbba56804a7a7bcceaa5d4b7e29e3f15fc0e59 + 6442c5a67cdd4cbaeedb2c532e0dc0667a79c202 diff --git a/pacemaker-1.1.11+git20140408.d9fbba5.tar.bz2 b/pacemaker-1.1.11+git20140408.d9fbba5.tar.bz2 deleted file mode 100644 index 9e08756..0000000 --- a/pacemaker-1.1.11+git20140408.d9fbba5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a8b6f8aea3b0ba4e27778358871643c9b0af410b0ce40fcd09604eca77cb32b -size 9436232 diff --git a/pacemaker-1.1.11+git20140409.6442c5a.tar.bz2 b/pacemaker-1.1.11+git20140409.6442c5a.tar.bz2 new file mode 100644 index 0000000..330ce04 --- /dev/null +++ b/pacemaker-1.1.11+git20140409.6442c5a.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5e3e3b0ec854e1b571bebe4f22a6628357ebb0894299055815ac4f5b34ffbb0 +size 9428490 diff --git a/pacemaker-pengine-nvpair-id-ref-test.patch b/pacemaker-pengine-nvpair-id-ref-test.patch deleted file mode 100644 index bf079ce..0000000 --- a/pacemaker-pengine-nvpair-id-ref-test.patch +++ /dev/null @@ -1,299 +0,0 @@ -commit 9077dde4ae249fee4cb6e8d3a1d09f45607b1250 -Author: Gao,Yan -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 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" - do_test novell-251689 "Resource definition change + target_role=stopped" - do_test bug-lf-2106 "Restart all anonymous clone instances after config change" - do_test params-6 "Params: Detect reload in previously migrated resource" -+do_test nvpair-id-ref "Support id-ref in nvpair with optional name" - - echo "" - do_test target-0 "Target Role : baseline" -diff --git a/pengine/test10/nvpair-id-ref.dot b/pengine/test10/nvpair-id-ref.dot -new file mode 100644 -index 0000000..f3aaaa5 ---- /dev/null -+++ b/pengine/test10/nvpair-id-ref.dot -@@ -0,0 +1,23 @@ -+digraph "g" { -+"probe_complete node1" -> "probe_complete" [ style = bold] -+"probe_complete node1" [ style=bold color="green" fontcolor="black"] -+"probe_complete node2" -> "probe_complete" [ style = bold] -+"probe_complete node2" [ style=bold color="green" fontcolor="black"] -+"probe_complete" -> "rsc1_start_0 node2" [ style = bold] -+"probe_complete" -> "rsc2_start_0 node1" [ style = bold] -+"probe_complete" [ style=bold color="green" fontcolor="orange"] -+"rsc1_monitor_0 node1" -> "probe_complete node1" [ style = bold] -+"rsc1_monitor_0 node1" [ style=bold color="green" fontcolor="black"] -+"rsc1_monitor_0 node2" -> "probe_complete node2" [ style = bold] -+"rsc1_monitor_0 node2" [ style=bold color="green" fontcolor="black"] -+"rsc1_monitor_10000 node2" [ style=bold color="green" fontcolor="black"] -+"rsc1_start_0 node2" -> "rsc1_monitor_10000 node2" [ style = bold] -+"rsc1_start_0 node2" [ style=bold color="green" fontcolor="black"] -+"rsc2_monitor_0 node1" -> "probe_complete node1" [ style = bold] -+"rsc2_monitor_0 node1" [ style=bold color="green" fontcolor="black"] -+"rsc2_monitor_0 node2" -> "probe_complete node2" [ style = bold] -+"rsc2_monitor_0 node2" [ style=bold color="green" fontcolor="black"] -+"rsc2_monitor_10000 node1" [ style=bold color="green" fontcolor="black"] -+"rsc2_start_0 node1" -> "rsc2_monitor_10000 node1" [ style = bold] -+"rsc2_start_0 node1" [ style=bold color="green" fontcolor="black"] -+} -diff --git a/pengine/test10/nvpair-id-ref.exp b/pengine/test10/nvpair-id-ref.exp -new file mode 100644 -index 0000000..0ad069d ---- /dev/null -+++ b/pengine/test10/nvpair-id-ref.exp -@@ -0,0 +1,135 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -diff --git a/pengine/test10/nvpair-id-ref.scores b/pengine/test10/nvpair-id-ref.scores -new file mode 100644 -index 0000000..fb86bf6 ---- /dev/null -+++ b/pengine/test10/nvpair-id-ref.scores -@@ -0,0 +1,7 @@ -+Allocation scores: -+native_color: rsc1 allocation score on node1: 0 -+native_color: rsc1 allocation score on node2: 0 -+native_color: rsc2 allocation score on node1: 0 -+native_color: rsc2 allocation score on node2: 0 -+native_color: rsc_stonith allocation score on node1: 0 -+native_color: rsc_stonith allocation score on node2: 0 -diff --git a/pengine/test10/nvpair-id-ref.summary b/pengine/test10/nvpair-id-ref.summary -new file mode 100644 -index 0000000..dbe685f ---- /dev/null -+++ b/pengine/test10/nvpair-id-ref.summary -@@ -0,0 +1,30 @@ -+ -+Current cluster status: -+Online: [ node1 node2 ] -+ -+ rsc_stonith (stonith:null): Started node1 -+ rsc1 (ocf::pacemaker:Dummy): Stopped -+ rsc2 (ocf::pacemaker:Dummy): Stopped -+ -+Transition Summary: -+ * Start rsc1 (node2) -+ * Start rsc2 (node1) -+ -+Executing cluster transition: -+ * Resource action: rsc1 monitor on node2 -+ * Resource action: rsc1 monitor on node1 -+ * Resource action: rsc2 monitor on node2 -+ * Resource action: rsc2 monitor on node1 -+ * Pseudo action: probe_complete -+ * Resource action: rsc1 start on node2 -+ * Resource action: rsc2 start on node1 -+ * Resource action: rsc1 monitor=10000 on node2 -+ * Resource action: rsc2 monitor=10000 on node1 -+ -+Revised cluster status: -+Online: [ node1 node2 ] -+ -+ rsc_stonith (stonith:null): Started node1 -+ rsc1 (ocf::pacemaker:Dummy): Started node2 -+ rsc2 (ocf::pacemaker:Dummy): Started node1 -+ -diff --git a/pengine/test10/nvpair-id-ref.xml b/pengine/test10/nvpair-id-ref.xml -new file mode 100644 -index 0000000..5580e96 ---- /dev/null -+++ b/pengine/test10/nvpair-id-ref.xml -@@ -0,0 +1,56 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ diff --git a/pacemaker-pengine-nvpair-id-ref.patch b/pacemaker-pengine-nvpair-id-ref.patch deleted file mode 100644 index f28a7d6..0000000 --- a/pacemaker-pengine-nvpair-id-ref.patch +++ /dev/null @@ -1,169 +0,0 @@ -commit 3912538a8954158d44a57f23aa219c5529a170ab -Author: Gao,Yan -Date: Wed Jan 29 14:07:44 2014 +0800 - - Feature: pengine: Support id-ref in nvpair with optional "name" - - If "name" isn't specified, it inherits the name from the referenced - nvpair. - -diff --git a/lib/pengine/rules.c b/lib/pengine/rules.c -index f80aa47..626d7b2 100644 ---- a/lib/pengine/rules.c -+++ b/lib/pengine/rules.c -@@ -607,7 +607,7 @@ sort_pairs(gconstpointer a, gconstpointer b) - } - - static void --populate_hash(xmlNode * nvpair_list, GHashTable * hash, gboolean overwrite) -+populate_hash(xmlNode * nvpair_list, GHashTable * hash, gboolean overwrite, xmlNode * top) - { - const char *name = NULL; - const char *value = NULL; -@@ -622,10 +622,18 @@ populate_hash(xmlNode * nvpair_list, GHashTable * hash, gboolean overwrite) - - for (an_attr = __xml_first_child(list); an_attr != NULL; an_attr = __xml_next(an_attr)) { - if (crm_str_eq((const char *)an_attr->name, XML_CIB_TAG_NVPAIR, TRUE)) { -+ xmlNode *ref_nvpair = expand_idref(an_attr, top); -+ - name = crm_element_value(an_attr, XML_NVPAIR_ATTR_NAME); -+ if (name == NULL) { -+ name = crm_element_value(ref_nvpair, XML_NVPAIR_ATTR_NAME); -+ } - - crm_trace("Setting attribute: %s", name); - value = crm_element_value(an_attr, XML_NVPAIR_ATTR_VALUE); -+ if (value == NULL) { -+ value = crm_element_value(ref_nvpair, XML_NVPAIR_ATTR_VALUE); -+ } - - if (name == NULL || value == NULL) { - continue; -@@ -657,6 +665,7 @@ struct unpack_data_s { - GHashTable *node_hash; - GHashTable *hash; - crm_time_t *now; -+ xmlNode *top; - }; - - static void -@@ -670,7 +679,7 @@ unpack_attr_set(gpointer data, gpointer user_data) - } - - crm_trace("Adding attributes from %s", pair->name); -- populate_hash(pair->attr_set, unpack_data->hash, unpack_data->overwrite); -+ populate_hash(pair->attr_set, unpack_data->hash, unpack_data->overwrite, unpack_data->top); - } - - void -@@ -717,6 +726,7 @@ unpack_instance_attributes(xmlNode * top, xmlNode * xml_obj, const char *set_nam - data.node_hash = node_hash; - data.now = now; - data.overwrite = overwrite; -+ data.top = top; - } - - sorted = g_list_sort(unsorted, sort_pairs); -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 @@ - - - -- -+ - - -- -+ - - - -diff --git a/xml/nvset-1.3.rng b/xml/nvset-1.3.rng -new file mode 100644 -index 0000000..8f1696c ---- /dev/null -+++ b/xml/nvset-1.3.rng -@@ -0,0 +1,45 @@ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -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 @@ - - - -- -+ - - - -@@ -86,7 +86,7 @@ - - - -- -+ - - - -@@ -144,10 +144,10 @@ - - - -- -+ - - -- -+ - - - diff --git a/pacemaker.changes b/pacemaker.changes index 97012b1..f9f8922 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Apr 9 04:41:38 UTC 2014 - ygao@suse.com + +- pengine: Support id-ref in nvpair with optional "name" (FATE#316118) + Drop the patches that have been merged upstream: + * pacemaker-pengine-nvpair-id-ref.patch + * pacemaker-pengine-nvpair-id-ref-test.patch +- Upstream version cs: 6442c5a67cdd4cbaeedb2c532e0dc0667a79c202 + ------------------------------------------------------------------- Tue Apr 8 13:34:59 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index a728052..2dee292 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -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+git20140408.d9fbba5 +Version: 1.1.11+git20140409.6442c5a Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org @@ -111,8 +111,6 @@ Patch4: pacemaker-colocated-utilization.patch Patch5: pacemaker-cibsecret-tool-temp-disabled.patch Patch6: pacemaker-nagios-plugin-dir.patch Patch7: bug-812269_pacemaker-fencing-device-register-messages.patch -Patch8: pacemaker-pengine-nvpair-id-ref.patch -Patch9: pacemaker-pengine-nvpair-id-ref-test.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: pacemaker-ticket-support = 2.0 Conflicts: heartbeat < 3.0 @@ -397,8 +395,6 @@ manager for Corosync, CMAN and/or Linux-HA. %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p1 -%patch9 -p1 # Force the local time #