From 6bef17630884e55561f9e532cb935c270ae113dcc64a5d377d08fe5703a20905 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Thu, 9 Apr 2015 12:31:30 +0000 Subject: [PATCH 1/6] - PE: Turn off legacy unpacking of resource options into the meta hashtable - acl: Do not delay evaluation of added nodes in some situations - docker-wrapper: add demote, promote, and notify actions for multistate rsc - docker-wrapper: properly forward key value pairs during isolation - attrd: fixes double free in attrd legacy - lrmd: do not let isolation wrappers inherit the wrapper attribute, or it makes a loop - pengine: pass node name of pcmk host into isolated resources - lrmd: isolation wrappers are moved from containers to isolation OCF namepace - pengine: Fix colocation with unmanaged resources - stonith-ng: Correctly track node state - stonith-ng: No reply is needed for CRM_OP_RM_NODE_CACHE - crm_resource: Fix output format of the warning from --force-start - crm_resource: Display the locations of all anonymous clone children when supplying the children's common ID (bsc#870339) - cib: Correctly track node state - Upstream version cs: 35e2d8ff0672b61a3aaba3c9bfb74d08875efb46 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=196 --- _service | 2 +- pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2 | 3 --- pacemaker-1.1.12.git20150407.35e2d8f.tar.bz2 | 3 +++ pacemaker.changes | 19 +++++++++++++++++++ pacemaker.spec | 4 ++-- 5 files changed, 25 insertions(+), 6 deletions(-) delete mode 100644 pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2 create mode 100644 pacemaker-1.1.12.git20150407.35e2d8f.tar.bz2 diff --git a/_service b/_service index 1336dda..1715222 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.12 --> 1.1.12.git%cd.%h - 3e93bc1dd6c1c3f2ee101f754567aa007b24bb5e + 35e2d8ff0672b61a3aaba3c9bfb74d08875efb46 diff --git a/pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2 b/pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2 deleted file mode 100644 index 0af82d9..0000000 --- a/pacemaker-1.1.12.git20150326.3e93bc1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb261c04ef0c746ca0f690856d9bdd23374d50accc938d08805df2176f64ff60 -size 9567712 diff --git a/pacemaker-1.1.12.git20150407.35e2d8f.tar.bz2 b/pacemaker-1.1.12.git20150407.35e2d8f.tar.bz2 new file mode 100644 index 0000000..35f96ba --- /dev/null +++ b/pacemaker-1.1.12.git20150407.35e2d8f.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8ec4217bc295a1b6c1a1f25a98c956ff6e78f43bdd5f5b178c9ae35849185f57 +size 9567066 diff --git a/pacemaker.changes b/pacemaker.changes index 06888d6..6baaac7 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu Apr 9 12:29:56 UTC 2015 - ygao@suse.com + +- PE: Turn off legacy unpacking of resource options into the meta hashtable +- acl: Do not delay evaluation of added nodes in some situations +- docker-wrapper: add demote, promote, and notify actions for multistate rsc +- docker-wrapper: properly forward key value pairs during isolation +- attrd: fixes double free in attrd legacy +- lrmd: do not let isolation wrappers inherit the wrapper attribute, or it makes a loop +- pengine: pass node name of pcmk host into isolated resources +- lrmd: isolation wrappers are moved from containers to isolation OCF namepace +- pengine: Fix colocation with unmanaged resources +- stonith-ng: Correctly track node state +- stonith-ng: No reply is needed for CRM_OP_RM_NODE_CACHE +- crm_resource: Fix output format of the warning from --force-start +- crm_resource: Display the locations of all anonymous clone children when supplying the children's common ID (bsc#870339) +- cib: Correctly track node state +- Upstream version cs: 35e2d8ff0672b61a3aaba3c9bfb74d08875efb46 + ------------------------------------------------------------------- Fri Mar 27 15:09:25 UTC 2015 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 69d3532..0e967ef 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -99,7 +99,7 @@ Name: pacemaker Summary: Scalable High-Availability cluster resource manager License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA -Version: 1.1.12.git20150326.3e93bc1 +Version: 1.1.12.git20150407.35e2d8f Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org @@ -657,7 +657,7 @@ fi %dir /usr/lib/ocf %dir /usr/lib/ocf/resource.d /usr/lib/ocf/resource.d/pacemaker -/usr/lib/ocf/resource.d/containers +/usr/lib/ocf/resource.d/isolation %if 0%{?cs_version} < 2 %{_libexecdir}/lcrso/pacemaker.lcrso From d8538b0b1417c42c94a5d55aa8dd28776ffbbf68d0af9a248acad425d827c448 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Thu, 9 Apr 2015 13:18:46 +0000 Subject: [PATCH 2/6] - Rebase: * pacemaker-NodeUtilization-RA.patch OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=197 --- pacemaker-NodeUtilization-RA.patch | 2 +- pacemaker.changes | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pacemaker-NodeUtilization-RA.patch b/pacemaker-NodeUtilization-RA.patch index b0ea547..dcb9b95 100644 --- a/pacemaker-NodeUtilization-RA.patch +++ b/pacemaker-NodeUtilization-RA.patch @@ -16,7 +16,7 @@ Index: pacemaker/extra/resources/Makefile.am + remote \ + NodeUtilization - containertech_SCRIPTS = docker-wrapper + isolationtech_SCRIPTS = docker-wrapper Index: pacemaker/extra/resources/NodeUtilization =================================================================== diff --git a/pacemaker.changes b/pacemaker.changes index 6baaac7..4c2272a 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,6 +1,9 @@ ------------------------------------------------------------------- Thu Apr 9 12:29:56 UTC 2015 - ygao@suse.com +- Rebase: + * pacemaker-NodeUtilization-RA.patch + - PE: Turn off legacy unpacking of resource options into the meta hashtable - acl: Do not delay evaluation of added nodes in some situations - docker-wrapper: add demote, promote, and notify actions for multistate rsc From 94be1aa9641fd0e2630b5fc28769e62488a8e702e7350d441fcf6f746af24c96 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Fri, 10 Apr 2015 12:51:42 +0000 Subject: [PATCH 3/6] - crm_report: More patterns for finding logs on non-DC nodes - lrmd: Use original timestamps when reporting multi-step systemd operations - lrmd: report original timeout when systemd operation completes - systemd: improve unit files - Upstream version cs: 3cf5ba7c407a460f1fd9baed13c94a8a24f4d34b OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=198 --- _service | 2 +- pacemaker-1.1.12.git20150407.35e2d8f.tar.bz2 | 3 --- pacemaker-1.1.12.git20150410.3cf5ba7.tar.bz2 | 3 +++ pacemaker.changes | 8 ++++++-- pacemaker.spec | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 pacemaker-1.1.12.git20150407.35e2d8f.tar.bz2 create mode 100644 pacemaker-1.1.12.git20150410.3cf5ba7.tar.bz2 diff --git a/_service b/_service index 1715222..eb528b8 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.12 --> 1.1.12.git%cd.%h - 35e2d8ff0672b61a3aaba3c9bfb74d08875efb46 + 3cf5ba7c407a460f1fd9baed13c94a8a24f4d34b diff --git a/pacemaker-1.1.12.git20150407.35e2d8f.tar.bz2 b/pacemaker-1.1.12.git20150407.35e2d8f.tar.bz2 deleted file mode 100644 index 35f96ba..0000000 --- a/pacemaker-1.1.12.git20150407.35e2d8f.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ec4217bc295a1b6c1a1f25a98c956ff6e78f43bdd5f5b178c9ae35849185f57 -size 9567066 diff --git a/pacemaker-1.1.12.git20150410.3cf5ba7.tar.bz2 b/pacemaker-1.1.12.git20150410.3cf5ba7.tar.bz2 new file mode 100644 index 0000000..d86f933 --- /dev/null +++ b/pacemaker-1.1.12.git20150410.3cf5ba7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8758b69781851a533cdd83f86315aa6c55ce49c1edf003e1813047a4e0ca7ad +size 9566216 diff --git a/pacemaker.changes b/pacemaker.changes index 4c2272a..f7ab8f8 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,9 +1,13 @@ ------------------------------------------------------------------- -Thu Apr 9 12:29:56 UTC 2015 - ygao@suse.com +Fri Apr 10 12:48:23 UTC 2015 - ygao@suse.com - Rebase: * pacemaker-NodeUtilization-RA.patch +- crm_report: More patterns for finding logs on non-DC nodes +- lrmd: Use original timestamps when reporting multi-step systemd operations +- lrmd: report original timeout when systemd operation completes +- systemd: improve unit files - PE: Turn off legacy unpacking of resource options into the meta hashtable - acl: Do not delay evaluation of added nodes in some situations - docker-wrapper: add demote, promote, and notify actions for multistate rsc @@ -18,7 +22,7 @@ Thu Apr 9 12:29:56 UTC 2015 - ygao@suse.com - crm_resource: Fix output format of the warning from --force-start - crm_resource: Display the locations of all anonymous clone children when supplying the children's common ID (bsc#870339) - cib: Correctly track node state -- Upstream version cs: 35e2d8ff0672b61a3aaba3c9bfb74d08875efb46 +- Upstream version cs: 3cf5ba7c407a460f1fd9baed13c94a8a24f4d34b ------------------------------------------------------------------- Fri Mar 27 15:09:25 UTC 2015 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 0e967ef..160f4bc 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -99,7 +99,7 @@ Name: pacemaker Summary: Scalable High-Availability cluster resource manager License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA -Version: 1.1.12.git20150407.35e2d8f +Version: 1.1.12.git20150410.3cf5ba7 Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org From 14fcf447e7755c2278f3e66ffc9a7070146e10bfbaa692970b8a739700322663 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Fri, 10 Apr 2015 17:33:56 +0000 Subject: [PATCH 4/6] - docker-wrapper: only override exit reason if docker daemon is inactive - pengine: handle isolated resource scenario, cloned group of isolated resources - pengine: handle cloned isolated resources in a sane way - Upstream version cs: 3263963bf0f5ef2ecc88e7806a59af09e017de28 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=199 --- _service | 2 +- pacemaker-1.1.12.git20150410.3263963.tar.bz2 | 3 +++ pacemaker-1.1.12.git20150410.3cf5ba7.tar.bz2 | 3 --- pacemaker.changes | 7 +++++-- pacemaker.spec | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 pacemaker-1.1.12.git20150410.3263963.tar.bz2 delete mode 100644 pacemaker-1.1.12.git20150410.3cf5ba7.tar.bz2 diff --git a/_service b/_service index eb528b8..3b6a03a 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.12 --> 1.1.12.git%cd.%h - 3cf5ba7c407a460f1fd9baed13c94a8a24f4d34b + 3263963bf0f5ef2ecc88e7806a59af09e017de28 diff --git a/pacemaker-1.1.12.git20150410.3263963.tar.bz2 b/pacemaker-1.1.12.git20150410.3263963.tar.bz2 new file mode 100644 index 0000000..1ddc1b4 --- /dev/null +++ b/pacemaker-1.1.12.git20150410.3263963.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a79247681abbd926d9cbd1c97beab41e2fd4282997c2b3ecb9643df017e68189 +size 9563852 diff --git a/pacemaker-1.1.12.git20150410.3cf5ba7.tar.bz2 b/pacemaker-1.1.12.git20150410.3cf5ba7.tar.bz2 deleted file mode 100644 index d86f933..0000000 --- a/pacemaker-1.1.12.git20150410.3cf5ba7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8758b69781851a533cdd83f86315aa6c55ce49c1edf003e1813047a4e0ca7ad -size 9566216 diff --git a/pacemaker.changes b/pacemaker.changes index f7ab8f8..b405fd9 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,9 +1,12 @@ ------------------------------------------------------------------- -Fri Apr 10 12:48:23 UTC 2015 - ygao@suse.com +Fri Apr 10 17:31:24 UTC 2015 - ygao@suse.com - Rebase: * pacemaker-NodeUtilization-RA.patch +- docker-wrapper: only override exit reason if docker daemon is inactive +- pengine: handle isolated resource scenario, cloned group of isolated resources +- pengine: handle cloned isolated resources in a sane way - crm_report: More patterns for finding logs on non-DC nodes - lrmd: Use original timestamps when reporting multi-step systemd operations - lrmd: report original timeout when systemd operation completes @@ -22,7 +25,7 @@ Fri Apr 10 12:48:23 UTC 2015 - ygao@suse.com - crm_resource: Fix output format of the warning from --force-start - crm_resource: Display the locations of all anonymous clone children when supplying the children's common ID (bsc#870339) - cib: Correctly track node state -- Upstream version cs: 3cf5ba7c407a460f1fd9baed13c94a8a24f4d34b +- Upstream version cs: 3263963bf0f5ef2ecc88e7806a59af09e017de28 ------------------------------------------------------------------- Fri Mar 27 15:09:25 UTC 2015 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 160f4bc..c572a44 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -99,7 +99,7 @@ Name: pacemaker Summary: Scalable High-Availability cluster resource manager License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA -Version: 1.1.12.git20150410.3cf5ba7 +Version: 1.1.12.git20150410.3263963 Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org From af774e777aa93c7a3ed1ce6ff8540fb13c995e4b1bebd03a98bab0f359c1f1e4 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Mon, 13 Apr 2015 09:00:29 +0000 Subject: [PATCH 5/6] - docker-wrapper: per resource logging of lrmd and remote client tool - pengine: Avoid trailing whitespaces when printing resource state - pengine: cl#5207 - Display "UNCLEAN" for resources running on unclean offline nodes - docker-wrapper: add reuse option for presistent containers - Upstream version cs: 7a2e3ae6b736621933b24f4cdc9ea260021d878d OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=200 --- _service | 2 +- pacemaker-1.1.12.git20150410.3263963.tar.bz2 | 3 --- pacemaker-1.1.12.git20150413.7a2e3ae.tar.bz2 | 3 +++ pacemaker.changes | 8 ++++++-- pacemaker.spec | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) delete mode 100644 pacemaker-1.1.12.git20150410.3263963.tar.bz2 create mode 100644 pacemaker-1.1.12.git20150413.7a2e3ae.tar.bz2 diff --git a/_service b/_service index 3b6a03a..9892e55 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.12 --> 1.1.12.git%cd.%h - 3263963bf0f5ef2ecc88e7806a59af09e017de28 + 7a2e3ae6b736621933b24f4cdc9ea260021d878d diff --git a/pacemaker-1.1.12.git20150410.3263963.tar.bz2 b/pacemaker-1.1.12.git20150410.3263963.tar.bz2 deleted file mode 100644 index 1ddc1b4..0000000 --- a/pacemaker-1.1.12.git20150410.3263963.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a79247681abbd926d9cbd1c97beab41e2fd4282997c2b3ecb9643df017e68189 -size 9563852 diff --git a/pacemaker-1.1.12.git20150413.7a2e3ae.tar.bz2 b/pacemaker-1.1.12.git20150413.7a2e3ae.tar.bz2 new file mode 100644 index 0000000..11c477d --- /dev/null +++ b/pacemaker-1.1.12.git20150413.7a2e3ae.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f5b3f6defb158754ffb6c027b11099aa2b1597e91c4dbeb92cad95098ed0e884 +size 9563881 diff --git a/pacemaker.changes b/pacemaker.changes index b405fd9..1c7e38d 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,9 +1,13 @@ ------------------------------------------------------------------- -Fri Apr 10 17:31:24 UTC 2015 - ygao@suse.com +Mon Apr 13 08:57:35 UTC 2015 - ygao@suse.com - Rebase: * pacemaker-NodeUtilization-RA.patch +- docker-wrapper: per resource logging of lrmd and remote client tool +- pengine: Avoid trailing whitespaces when printing resource state +- pengine: cl#5207 - Display "UNCLEAN" for resources running on unclean offline nodes +- docker-wrapper: add reuse option for presistent containers - docker-wrapper: only override exit reason if docker daemon is inactive - pengine: handle isolated resource scenario, cloned group of isolated resources - pengine: handle cloned isolated resources in a sane way @@ -25,7 +29,7 @@ Fri Apr 10 17:31:24 UTC 2015 - ygao@suse.com - crm_resource: Fix output format of the warning from --force-start - crm_resource: Display the locations of all anonymous clone children when supplying the children's common ID (bsc#870339) - cib: Correctly track node state -- Upstream version cs: 3263963bf0f5ef2ecc88e7806a59af09e017de28 +- Upstream version cs: 7a2e3ae6b736621933b24f4cdc9ea260021d878d ------------------------------------------------------------------- Fri Mar 27 15:09:25 UTC 2015 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index c572a44..17207cd 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -99,7 +99,7 @@ Name: pacemaker Summary: Scalable High-Availability cluster resource manager License: GPL-2.0+ and LGPL-2.1+ Group: Productivity/Clustering/HA -Version: 1.1.12.git20150410.3263963 +Version: 1.1.12.git20150413.7a2e3ae Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org From 268172016957e1c4ca766947c543780c9b26f2f4c77b66c5dc673ef0e5a4857c Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Mon, 20 Apr 2015 11:47:35 +0000 Subject: [PATCH 6/6] - acl: Do not delay evaluation of added nodes in some situations (bsc#927828: CVE-2015-1867) OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=201 --- pacemaker.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pacemaker.changes b/pacemaker.changes index 1c7e38d..b4d496e 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -16,7 +16,7 @@ Mon Apr 13 08:57:35 UTC 2015 - ygao@suse.com - lrmd: report original timeout when systemd operation completes - systemd: improve unit files - PE: Turn off legacy unpacking of resource options into the meta hashtable -- acl: Do not delay evaluation of added nodes in some situations +- acl: Do not delay evaluation of added nodes in some situations (bsc#927828: CVE-2015-1867) - docker-wrapper: add demote, promote, and notify actions for multistate rsc - docker-wrapper: properly forward key value pairs during isolation - attrd: fixes double free in attrd legacy