From 5cf884ed270af415184d8af16f8b3c527f35f9c2c9a41f7bc24732ee94eadd71 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Mon, 10 Nov 2014 11:40:32 +0000 Subject: [PATCH 1/5] - pengine: exclusive discovery implies rsc is only allowed on exclusive subset of nodes - dbus: handle dispatch queue when multiple replies need to be processed - dbus ref count leaks - dbus: Ensure both the read and write queues get dispatched - systemd: Ensure failed monitor operations always return - Perform systemd reloads asynchronously - Upstream version cs: cd7c9abbcfc620aa84194ee07aade142240db15a OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=170 --- _service | 2 +- pacemaker-1.1.12.git20141028.a9c8177.tar.bz2 | 3 --- pacemaker-1.1.12.git20141107.cd7c9ab.tar.bz2 | 3 +++ pacemaker.changes | 11 +++++++++++ pacemaker.spec | 2 +- 5 files changed, 16 insertions(+), 5 deletions(-) delete mode 100644 pacemaker-1.1.12.git20141028.a9c8177.tar.bz2 create mode 100644 pacemaker-1.1.12.git20141107.cd7c9ab.tar.bz2 diff --git a/_service b/_service index e246443..c697cbf 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.12 --> 1.1.12.git%cd.%h - a9c81774b89f21f990be255f9862446d1a38afee + cd7c9abbcfc620aa84194ee07aade142240db15a diff --git a/pacemaker-1.1.12.git20141028.a9c8177.tar.bz2 b/pacemaker-1.1.12.git20141028.a9c8177.tar.bz2 deleted file mode 100644 index 5a65a81..0000000 --- a/pacemaker-1.1.12.git20141028.a9c8177.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7c422515b6267a10bf33e806e3fdc3a0e66349a96febff8a2f8a3be1952f9b5 -size 144947242 diff --git a/pacemaker-1.1.12.git20141107.cd7c9ab.tar.bz2 b/pacemaker-1.1.12.git20141107.cd7c9ab.tar.bz2 new file mode 100644 index 0000000..b870e81 --- /dev/null +++ b/pacemaker-1.1.12.git20141107.cd7c9ab.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2a8861b24eb03169227ec28598646780c1355e9e045f46d4ee5378b62e3e6cf7 +size 145194731 diff --git a/pacemaker.changes b/pacemaker.changes index dbd7a64..f8bac51 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Nov 10 11:36:27 UTC 2014 - ygao@suse.com + +- pengine: exclusive discovery implies rsc is only allowed on exclusive subset of nodes +- dbus: handle dispatch queue when multiple replies need to be processed +- dbus ref count leaks +- dbus: Ensure both the read and write queues get dispatched +- systemd: Ensure failed monitor operations always return +- Perform systemd reloads asynchronously +- Upstream version cs: cd7c9abbcfc620aa84194ee07aade142240db15a + ------------------------------------------------------------------- Tue Oct 28 14:21:58 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 2a33668..c93f1c2 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.git20141028.a9c8177 +Version: 1.1.12.git20141107.cd7c9ab Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org From 120c1f3f7f17baff7406c483afd6e3ffb0b7c0466f92b7778ed8c547c241812b Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Fri, 14 Nov 2014 09:26:59 +0000 Subject: [PATCH 2/5] Accepting request 261539 from home:dimstar:branches:network:ha-clustering:Factory - Drop conditional BuildRequires of system-devel: it was required one line lower unconditionally. - Replace remaining systemd-devel BuildRequires with pkgconfig(systemd). OBS-URL: https://build.opensuse.org/request/show/261539 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=171 --- pacemaker.changes | 8 ++++++++ pacemaker.spec | 5 +---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pacemaker.changes b/pacemaker.changes index f8bac51..c07d7c9 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Nov 14 08:58:40 UTC 2014 - dimstar@opensuse.org + +- Drop conditional BuildRequires of system-devel: it was required + one line lower unconditionally. +- Replace remaining systemd-devel BuildRequires with + pkgconfig(systemd). + ------------------------------------------------------------------- Mon Nov 10 11:36:27 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index c93f1c2..5e7254f 100644 --- a/pacemaker.spec +++ b/pacemaker.spec @@ -194,10 +194,7 @@ BuildRequires: libselinux-devel BuildRequires: ncurses-devel BuildRequires: openssl-devel -%if %{defined _unitdir} -BuildRequires: systemd-devel -%endif -BuildRequires: systemd-devel +BuildRequires: pkgconfig(systemd) %if %{with cman} From a6e7ebbcbd75af419784f7a2a30db2f3f192557610c6dffa04548da08427099f Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Fri, 14 Nov 2014 09:45:34 +0000 Subject: [PATCH 3/5] - pengine: make resource-discovery work with location rules - services: Conditionally clean up services actions - Upstream version cs: 5093c095c5f517ab58375b2b69ecfc5516c86b5b OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=172 --- _service | 2 +- pacemaker-1.1.12.git20141107.cd7c9ab.tar.bz2 | 3 --- pacemaker-1.1.12.git20141113.5093c09.tar.bz2 | 3 +++ pacemaker.changes | 7 +++++++ pacemaker.spec | 2 +- 5 files changed, 12 insertions(+), 5 deletions(-) delete mode 100644 pacemaker-1.1.12.git20141107.cd7c9ab.tar.bz2 create mode 100644 pacemaker-1.1.12.git20141113.5093c09.tar.bz2 diff --git a/_service b/_service index c697cbf..d90267a 100644 --- a/_service +++ b/_service @@ -11,7 +11,7 @@ 1.1.12 --> 1.1.12.git%cd.%h - cd7c9abbcfc620aa84194ee07aade142240db15a + 5093c095c5f517ab58375b2b69ecfc5516c86b5b diff --git a/pacemaker-1.1.12.git20141107.cd7c9ab.tar.bz2 b/pacemaker-1.1.12.git20141107.cd7c9ab.tar.bz2 deleted file mode 100644 index b870e81..0000000 --- a/pacemaker-1.1.12.git20141107.cd7c9ab.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2a8861b24eb03169227ec28598646780c1355e9e045f46d4ee5378b62e3e6cf7 -size 145194731 diff --git a/pacemaker-1.1.12.git20141113.5093c09.tar.bz2 b/pacemaker-1.1.12.git20141113.5093c09.tar.bz2 new file mode 100644 index 0000000..07f0b50 --- /dev/null +++ b/pacemaker-1.1.12.git20141113.5093c09.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0f4b68455a9f031c80e2227604bc7dde173f7d4836a8698fa3394f163eb11384 +size 145209095 diff --git a/pacemaker.changes b/pacemaker.changes index c07d7c9..c9a8c8b 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 14 09:44:03 UTC 2014 - ygao@suse.com + +- pengine: make resource-discovery work with location rules +- services: Conditionally clean up services actions +- Upstream version cs: 5093c095c5f517ab58375b2b69ecfc5516c86b5b + ------------------------------------------------------------------- Fri Nov 14 08:58:40 UTC 2014 - dimstar@opensuse.org diff --git a/pacemaker.spec b/pacemaker.spec index 5e7254f..679bea2 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.git20141107.cd7c9ab +Version: 1.1.12.git20141113.5093c09 Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org From 1c4e80cbd88201488fc48047f28a5079907e37d7eb7ff7283e8f0ccb39f4feb2 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Fri, 14 Nov 2014 10:16:16 +0000 Subject: [PATCH 4/5] - use _rundir macro OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=173 --- pacemaker.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pacemaker.changes b/pacemaker.changes index c9a8c8b..fa581b6 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -298,7 +298,7 @@ Mon May 12 09:20:16 UTC 2014 - ygao@suse.com ------------------------------------------------------------------- Thu May 8 11:30:57 CEST 2014 - ro@suse.de -- use _rundir macro +- use _rundir macro ------------------------------------------------------------------- Mon May 5 07:42:25 UTC 2014 - ygao@suse.com From 88cda577638f0c0fce63b6884ef762169bd2e1685c7babc38e9de8c1fe65d8d1 Mon Sep 17 00:00:00 2001 From: Yan Gao Date: Fri, 21 Nov 2014 15:41:23 +0000 Subject: [PATCH 5/5] - crm_node: Correctly remove nodes from the CIB by nodeid - fencing: Allow nodes to be purged from the member cache - xml: cl#5231 - Unset the deleted attributes in the resulting diffs (bsc#905641) - fencing: stonith -l option for custom log - cib: Avoid nodeid conflicts we don't care about - Membership: Detect and resolve nodes that change their ID - attrd: Simplify how node deletions happen - attrd: Clean out the node cache when requested by the admin - crm_resource: Allow resource restart operations to be node specific - crm_resource: Implement --timeout for resource restart operations - crm_resource: Calculate how long to wait for a restart based on the resource timeouts - crm_resource: Implement an intelligent restart capability - crm_failcount: Better error reporting when no resource is specified - cib: tls sock cleanup for remote cib connections - Upstream version cs: 7dd90226e10035340d6707d9fd2b04f2e0141194 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/pacemaker?expand=0&rev=174 --- _service | 4 ++-- pacemaker-1.1.12.git20141113.5093c09.tar.bz2 | 3 --- pacemaker-1.1.12.git20141118.7dd9022.tar.bz2 | 3 +++ pacemaker.changes | 19 +++++++++++++++++++ pacemaker.spec | 2 +- 5 files changed, 25 insertions(+), 6 deletions(-) delete mode 100644 pacemaker-1.1.12.git20141113.5093c09.tar.bz2 create mode 100644 pacemaker-1.1.12.git20141118.7dd9022.tar.bz2 diff --git a/_service b/_service index d90267a..54d5a3d 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git git://github.com/ClusterLabs/pacemaker.git - yes + no .git 1.1.12.git%cd.%h - 5093c095c5f517ab58375b2b69ecfc5516c86b5b + 7dd90226e10035340d6707d9fd2b04f2e0141194 diff --git a/pacemaker-1.1.12.git20141113.5093c09.tar.bz2 b/pacemaker-1.1.12.git20141113.5093c09.tar.bz2 deleted file mode 100644 index 07f0b50..0000000 --- a/pacemaker-1.1.12.git20141113.5093c09.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0f4b68455a9f031c80e2227604bc7dde173f7d4836a8698fa3394f163eb11384 -size 145209095 diff --git a/pacemaker-1.1.12.git20141118.7dd9022.tar.bz2 b/pacemaker-1.1.12.git20141118.7dd9022.tar.bz2 new file mode 100644 index 0000000..dcd1370 --- /dev/null +++ b/pacemaker-1.1.12.git20141118.7dd9022.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ba3347698c14c1b25f17cc477218ccba3d86bcf41e709c4036e047899fad821a +size 9445997 diff --git a/pacemaker.changes b/pacemaker.changes index fa581b6..c29e0a6 100644 --- a/pacemaker.changes +++ b/pacemaker.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Nov 21 15:38:57 UTC 2014 - ygao@suse.com + +- crm_node: Correctly remove nodes from the CIB by nodeid +- fencing: Allow nodes to be purged from the member cache +- xml: cl#5231 - Unset the deleted attributes in the resulting diffs (bsc#905641) +- fencing: stonith -l option for custom log +- cib: Avoid nodeid conflicts we don't care about +- Membership: Detect and resolve nodes that change their ID +- attrd: Simplify how node deletions happen +- attrd: Clean out the node cache when requested by the admin +- crm_resource: Allow resource restart operations to be node specific +- crm_resource: Implement --timeout for resource restart operations +- crm_resource: Calculate how long to wait for a restart based on the resource timeouts +- crm_resource: Implement an intelligent restart capability +- crm_failcount: Better error reporting when no resource is specified +- cib: tls sock cleanup for remote cib connections +- Upstream version cs: 7dd90226e10035340d6707d9fd2b04f2e0141194 + ------------------------------------------------------------------- Fri Nov 14 09:44:03 UTC 2014 - ygao@suse.com diff --git a/pacemaker.spec b/pacemaker.spec index 679bea2..d92fd75 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.git20141113.5093c09 +Version: 1.1.12.git20141118.7dd9022 Release: 0 #Release: %{pcmk_release}%{?dist} Url: http://www.clusterlabs.org