From db6f415db68b2b196c788363780e98f97a12f24ee8b6b1695bfbff11f286d331 Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Tue, 14 Feb 2012 03:04:29 +0000 Subject: [PATCH 1/3] - Send CPG_REASON_PROCDOWN when really needed (bnc#740343) OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=13 --- corosync-cpg-procdown.patch | 13 +++++++++++++ corosync.changes | 5 +++++ corosync.spec | 20 +++++++++++--------- 3 files changed, 29 insertions(+), 9 deletions(-) create mode 100644 corosync-cpg-procdown.patch diff --git a/corosync-cpg-procdown.patch b/corosync-cpg-procdown.patch new file mode 100644 index 0000000..39f1620 --- /dev/null +++ b/corosync-cpg-procdown.patch @@ -0,0 +1,13 @@ +Index: corosync-1.4.1/services/cpg.c +=================================================================== +--- corosync-1.4.1.orig/services/cpg.c ++++ corosync-1.4.1/services/cpg.c +@@ -870,7 +870,7 @@ static int cpg_lib_exit_fn (void *conn) + + log_printf(LOGSYS_LEVEL_DEBUG, "exit_fn for conn=%p\n", conn); + +- if (cpd->group_name.length > 0) { ++ if (cpd->group_name.length > 0 && cpd->cpd_state != CPD_STATE_LEAVE_STARTED) { + result = cpg_node_joinleave_send (cpd->pid, &cpd->group_name, + MESSAGE_REQ_EXEC_CPG_PROCLEAVE, CONFCHG_CPG_REASON_PROCDOWN); + if (result == -1) { diff --git a/corosync.changes b/corosync.changes index eb1a47e..068fe35 100644 --- a/corosync.changes +++ b/corosync.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Feb 5 11:44:40 UTC 2012 - jjzhang@suse.com + +- Send CPG_REASON_PROCDOWN when really needed (bnc#740343) + ------------------------------------------------------------------- Tue Sep 20 13:15:22 UTC 2011 - tserong@suse.com diff --git a/corosync.spec b/corosync.spec index a5a375f..871b05d 100644 --- a/corosync.spec +++ b/corosync.spec @@ -1,7 +1,7 @@ # # spec file for package corosync # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %if 0%{?sles_version} == 11 %ifnarch s390 s390x %define buildib 1 @@ -27,16 +26,17 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces +License: BSD-3-Clause +Group: Productivity/Clustering/HA Version: 1.4.1 Release: 0 -License: BSD3c -Group: Productivity/Clustering/HA Url: http://www.corosync.org Source0: http://developer.osdl.org/dev/openais/downloads/%{name}-%{version}/%{name}-%{version}.tar.bz2 Source2: baselibs.conf Patch1: corosync-confexample-timestamp.patch Patch2: corosync-revert-cs2429.patch Patch4: corosync.conf.example.patch +Patch5: corosync-cpg-procdown.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # Runtime bits Requires: libcorosync4 = %{version}-%{release} @@ -47,11 +47,14 @@ Conflicts: openais <= 0.89, libopenais2 <= 0.89, libopenais-devel <= 0.89 %define buildtrunk 1 %{?_with_buildtrunk: %define buildtrunk 1} %if 0%{?buildtrunk} == 1 -BuildRequires: autoconf automake +BuildRequires: autoconf +BuildRequires: automake %endif -BuildRequires: mozilla-nss mozilla-nss-devel +BuildRequires: mozilla-nss +BuildRequires: mozilla-nss-devel %if 0%{?buildib} == 1 -BuildRequires: libibverbs-devel librdmacm-devel +BuildRequires: libibverbs-devel +BuildRequires: librdmacm-devel %endif BuildRequires: pkg-config @@ -60,6 +63,7 @@ BuildRequires: pkg-config %patch1 -p1 %patch2 -p1 %patch4 -p1 +%patch5 -p1 %build %if 0%{?buildtrunk} == 1 @@ -149,7 +153,6 @@ script. %{_mandir}/man5/corosync.conf.5* %package -n libcorosync4 -License: BSD3c Summary: The Corosync Cluster Engine Libraries Group: Productivity/Clustering/HA Conflicts: corosync < 0.92-7 @@ -181,7 +184,6 @@ This package contains corosync libraries. %postun -n libcorosync4 -p /sbin/ldconfig %package -n libcorosync-devel -License: BSD3c Summary: The Corosync Cluster Engine Development Kit Group: Productivity/Clustering/HA Requires: libcorosync4 = %{version}-%{release} From 9ba789b84389b9ff50e44216a328458fddca8af1fe2772f9b326742dfa731bb1 Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Tue, 14 Feb 2012 07:04:18 +0000 Subject: [PATCH 2/3] Bump release number OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=14 --- corosync.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/corosync.spec b/corosync.spec index 871b05d..a1bba73 100644 --- a/corosync.spec +++ b/corosync.spec @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %if 0%{?sles_version} == 11 %ifnarch s390 s390x %define buildib 1 From 0fed941646bfed8a768a5bc59373a14406af1cf665ef33f4359975d8afcf50ad Mon Sep 17 00:00:00 2001 From: Tim Serong Date: Tue, 14 Feb 2012 07:05:02 +0000 Subject: [PATCH 3/3] Bump release number OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=15 --- corosync.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/corosync.spec b/corosync.spec index a1bba73..871b05d 100644 --- a/corosync.spec +++ b/corosync.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - %if 0%{?sles_version} == 11 %ifnarch s390 s390x %define buildib 1