From cdcaa01206262689d1daeedc8beef3b1776c526569b8a41382585bf767488257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 9 Sep 2014 14:53:12 +0000 Subject: [PATCH] Accepting request 247181 from home:lisaseraph:branches:network:ha-clustering:Factory upgrade to newest version 2.3.4 OBS-URL: https://build.opensuse.org/request/show/247181 OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=57 --- bnc#867767-add-version.patch | 6 --- bnc#881142-fix-shm-leak.patch | 31 ------------- corosync-2.3.3.tar.gz | 3 -- corosync-2.3.4.tar.gz | 3 ++ corosync-cts-api-error.patch | 17 ------- corosync.changes | 86 ++++++++++++++++++++++++++++++++--- corosync.spec | 12 ++--- 7 files changed, 86 insertions(+), 72 deletions(-) delete mode 100644 bnc#867767-add-version.patch delete mode 100644 bnc#881142-fix-shm-leak.patch delete mode 100644 corosync-2.3.3.tar.gz create mode 100644 corosync-2.3.4.tar.gz delete mode 100644 corosync-cts-api-error.patch diff --git a/bnc#867767-add-version.patch b/bnc#867767-add-version.patch deleted file mode 100644 index 216f341..0000000 --- a/bnc#867767-add-version.patch +++ /dev/null @@ -1,6 +0,0 @@ -Index: corosync-2.3.3/.tarball-version -=================================================================== ---- /dev/null -+++ corosync-2.3.3/.tarball-version -@@ -0,0 +1 @@ -+2.3.3 diff --git a/bnc#881142-fix-shm-leak.patch b/bnc#881142-fix-shm-leak.patch deleted file mode 100644 index 43800c3..0000000 --- a/bnc#881142-fix-shm-leak.patch +++ /dev/null @@ -1,31 +0,0 @@ -Index: corosync-2.3.3/exec/main.c -=================================================================== ---- corosync-2.3.3.orig/exec/main.c -+++ corosync-2.3.3/exec/main.c -@@ -1107,6 +1107,7 @@ int main (int argc, char **argv, char ** - case 'v': - printf ("Corosync Cluster Engine, version '%s'\n", VERSION); - printf ("Copyright (c) 2006-2009 Red Hat, Inc.\n"); -+ logsys_system_fini(); - return EXIT_SUCCESS; - - break; -@@ -1117,6 +1118,7 @@ int main (int argc, char **argv, char ** - " -p : Does nothing. \n"\ - " -r : Set round robin realtime scheduling \n"\ - " -v : Display version and SVN revision of Corosync and exit.\n"); -+ logsys_system_fini(); - return EXIT_FAILURE; - } - } -@@ -1254,6 +1256,10 @@ int main (int argc, char **argv, char ** - qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH, - SIGINT, NULL, sig_exit_handler, NULL); - qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH, -+ SIGSEGV, NULL, sigsegv_handler, NULL); -+ qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH, -+ SIGABRT, NULL, sigabrt_handler, NULL); -+ qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH, - SIGQUIT, NULL, sig_exit_handler, NULL); - qb_loop_signal_add(corosync_poll_handle, QB_LOOP_HIGH, - SIGTERM, NULL, sig_exit_handler, NULL); diff --git a/corosync-2.3.3.tar.gz b/corosync-2.3.3.tar.gz deleted file mode 100644 index 1bf442f..0000000 --- a/corosync-2.3.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c60a007c9abc5163809cd7b6c431f137c3459abf13a5755a580c2bd2c4b141d1 -size 411719 diff --git a/corosync-2.3.4.tar.gz b/corosync-2.3.4.tar.gz new file mode 100644 index 0000000..10b661b --- /dev/null +++ b/corosync-2.3.4.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3dae93fb1cf5c560295253b0560cbc25421ed053ee373852864f3a60c03247d4 +size 994555 diff --git a/corosync-cts-api-error.patch b/corosync-cts-api-error.patch deleted file mode 100644 index 5c91ef8..0000000 --- a/corosync-cts-api-error.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: corosync-2.3.2/cts/corolab.py -=================================================================== ---- corosync-2.3.2.orig/cts/corolab.py -+++ corosync-2.3.2/cts/corolab.py -@@ -308,10 +308,10 @@ if __name__ == '__main__': - elif Environment["all-once"] or NumIter == 0: - NumIter = len(Tests) - scenario = AllOnce( -- cm, [ InitClusterManager(Environment), TestAgentComponent(Environment), PacketLoss(Environment) ], Audits, Tests) -+ cm, [ BootCluster(Environment), TestAgentComponent(Environment), PacketLoss(Environment) ], Audits, Tests) - else: - scenario = RandomTests( -- cm, [ InitClusterManager(Environment), TestAgentComponent(Environment), PacketLoss(Environment) ], Audits, Tests) -+ cm, [ BootCluster(Environment), TestAgentComponent(Environment), PacketLoss(Environment) ], Audits, Tests) - - Environment.log(">>>>>>>>>>>>>>>> BEGINNING " + repr(NumIter) + " TESTS ") - Environment.log("Stack: %s" % Environment["Stack"]) diff --git a/corosync.changes b/corosync.changes index b7ca095..e9ee5a2 100644 --- a/corosync.changes +++ b/corosync.changes @@ -1,27 +1,101 @@ +------------------------------------------------------------------- +Mon Sep 1 08:01:50 UTC 2014 - xli@suse.com + +- Update to corosync 2.3.4 +- Drop the obsoleted patches + - corosync-cts-api-error.patch + - bnc#867767-add-version.patch + - bnc#881142-fix-shm-leak.patch +- quorumtool: Sort output by nodeid +- YKD: Fix loading of YKD quorum module +- corosync-quorumtool: add sort options +- cleanup after test-driver +- be consistent in using CPPFLAGS vs CFLAGS +- totemsrp: Fix typo with cont gather +- cpg: Refactor mh_req_exec_cpg_procleave +- cpg: Make sure nodid is always logged as hex num +- cpg: Make sure left nodes are really removed +- mon: Make mon compilable with libstatgrab ver 0.9 +- mon: Fix comparsion typo +- mon: Pass correct pointer to inst +- mon: Make monitoring work +- config: Handle totem_set_volatile_defaults errors +- config: Allow dynamic change of token_coefficient +- Log: Make reload of logging work +- Really clear totemconfig nodes on reload +- Add token_coefficient option +- init: Make init script configurable +- totemiba: Fix incorrect failed log message +- logsys: Log error if blackbox cannot be created +- logsys: Log warning if flightrecorder init fails +- Introduce get_run_dir function +- Move ringid store and load from totem library +- coroparse: More strict numbers parsing +- Doc: Enhance INSTALL file a bit +- Make config.reload_in_progress key read only +- Fix compiler warning introduced by previous patch +- totemconfig: Free ifaddrs list +- totemconfig: Make sure join timeout is less than consensus +- totemconfig: Key change process dependencies +- totemconfig: Log errors on key change and reload +- totemconfig: totem_config_get_ip_version +- totemconfig: refactor nodelist_to_interface func +- corosync-keygen: Replace printf/exit call with err +- votequorum: Add cmap key to reset wait_for_all +- votequorum: Return current ring id in callback +- votequorum: Add ring id to poll call +- votequorum: Do not process events during reload +- votequorum: Block sync until qdevice poll +- votequorum: Make qdev timeout in sync configurable +- votequorum: Properly initialize atb and atb_string +- ipc: Process votequorum messages during sync +- testvotequorum2: Opt for polling with old ringid +- TODO: Remove TODO file +- Makefile: Do not install TODO file +- totem: Inform RRP about membership changes +- totemnet: Add totemnet_member_set_active +- totemrrp: Implement *_membership_changed +- totemudpu: Implement member_set_active +- totemudpu: Send msgs to all members occasionally +- Cancel token holding while in retransmition +- upstart: Make job conf file configurable +- systemd: Config example for corosync wd service +- Install doc: Correct a typo +- init: change return value when starting corosync +- Free object allocated at quorum_register_callback +- corosync-cmapctl: Allow -p option to delete keys +- Implement config file testing mode +- Slightly rework corosync-keygen. +- totemiba: Add multicast recovery +- Indent: Remove space in negation of expression +- Indent: Remove newline before else branch start +- fix memory leak produced by 'corosync -v' +- Handle SIGSEGV and SIGABRT signals + ------------------------------------------------------------------- Thu Jul 3 05:07:13 UTC 2014 - lzhong@suse.com - comment out line: to_logfile:no (bnc#882449) - work on patch bnc#882449-corosync-conf-example.patch + work on patch bnc#882449-corosync-conf-example.patch ------------------------------------------------------------------- Wed Jul 2 05:48:47 UTC 2014 - yzou@suse.com - Fixed shared memory leak. - + bnc#881142-fix-shm-leak.patch + + bnc#881142-fix-shm-leak.patch ------------------------------------------------------------------- Fri Jun 13 03:13:13 UTC 2014 - lzhong@suse.com - Update corosync.conf.example and corosync.conf.example.udpu(bnc#882449) - - remove corosync-conf-example.patch - + add bnc#882449-corosync-conf-example.patch + - remove corosync-conf-example.patch + + add bnc#882449-corosync-conf-example.patch ------------------------------------------------------------------- Fri Apr 11 06:50:17 UTC 2014 - lzhong@suse.com - Fix `systemctl stop pacemaker` leaves corosync running - + bnc#872651-stop-cluster.patch + + bnc#872651-stop-cluster.patch - Ensure that libopenais3 is removed on update of corosync(bnc#872122) ------------------------------------------------------------------- @@ -29,7 +103,7 @@ Wed Mar 12 08:41:21 UTC 2014 - lzhong@suse.com - Modify spec file:add symlink rccorosync to /usr/sbin/service (bnc#866057) - Fix corosync -v show UNKNOW (bnc#867767) - + bnc#867767-add-version.patch + + bnc#867767-add-version.patch ------------------------------------------------------------------- Tue Jan 21 07:48:22 UTC 2014 - xli@suse.com diff --git a/corosync.spec b/corosync.spec index 12a7fc1..c114f7b 100644 --- a/corosync.spec +++ b/corosync.spec @@ -44,17 +44,14 @@ Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces License: BSD-3-Clause Group: Productivity/Clustering/HA -Version: 2.3.3 +Version: 2.3.4 Release: 0 Url: http://www.corosync.org Source0: %{name}-%{version}.tar.gz Source2: baselibs.conf Patch1: corosync-init-lockfile-path-error.patch -Patch2: corosync-cts-api-error.patch -Patch3: bnc#867767-add-version.patch -Patch4: bnc#872651-stop-cluster.patch -Patch5: bnc#881142-fix-shm-leak.patch -Patch6: bnc#882449-corosync-conf-example.patch +Patch2: bnc#872651-stop-cluster.patch +Patch3: bnc#882449-corosync-conf-example.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # openais is indeed gone and should be uninstalled. Yes, we do not # provide openais on purpose, the package has been deleted. @@ -102,9 +99,6 @@ Requires: libxslt %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 %build #%if 0%{?buildtrunk} == 1