pool/corosync
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 239416 from network:ha-clustering:Factory

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/239416
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/corosync?expand=0&rev=25
This commit is contained in:
Stephan Kulow 2014-07-10 12:54:54 +00:00 committed by Git OBS Bridge
commit f25e70110b
4 changed files with 85 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
bnc#881142-fix-shm-leak.patch Normal file
View File

@ -0,0 +1,31 @@
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);

35
corosync-conf-example.patch → bnc#882449-corosync-conf-example.patch
View File

@ -1,7 +1,7 @@
Index: corosync-2.3.2/conf/corosync.conf.example
Index: corosync-2.3.3/conf/corosync.conf.example
===================================================================
--- corosync-2.3.2.orig/conf/corosync.conf.example
+++ corosync-2.3.2/conf/corosync.conf.example
--- corosync-2.3.3.orig/conf/corosync.conf.example
+++ corosync-2.3.3/conf/corosync.conf.example
@@ -9,6 +9,12 @@ totem {
crypto_cipher: none
crypto_hash: none
@ -15,6 +15,17 @@ Index: corosync-2.3.2/conf/corosync.conf.example
# interface: define at least one interface to communicate
# over. If you define more than one interface stanza, you must
# also set rrp_mode.
@@ -58,8 +64,8 @@ logging {
to_stderr: no
# Log to a log file. When set to "no", the "logfile" option
# must not be set.
- to_logfile: yes
- logfile: /var/log/cluster/corosync.log
+ #to_logfile: no
+ #logfile: /var/log/cluster/corosync.log
# Log to the system log daemon. When in doubt, set to yes.
to_syslog: yes
# Log debug messages (very verbose). When in doubt, leave off.
@@ -77,5 +83,5 @@ logging {
quorum {
# Enable and configure quorum subsystem (default: off)
@ -22,10 +33,10 @@ Index: corosync-2.3.2/conf/corosync.conf.example
- #provider: corosync_votequorum
+ provider: corosync_votequorum
}
Index: corosync-2.3.2/conf/corosync.conf.example.udpu
Index: corosync-2.3.3/conf/corosync.conf.example.udpu
===================================================================
--- corosync-2.3.2.orig/conf/corosync.conf.example.udpu
+++ corosync-2.3.2/conf/corosync.conf.example.udpu
--- corosync-2.3.3.orig/conf/corosync.conf.example.udpu
+++ corosync-2.3.3/conf/corosync.conf.example.udpu
@@ -5,6 +5,8 @@ totem {
crypto_cipher: none
crypto_hash: none
@ -35,6 +46,18 @@ Index: corosync-2.3.2/conf/corosync.conf.example.udpu
interface {
ringnumber: 0
bindnetaddr: 10.16.35.0
@@ -16,9 +18,9 @@ totem {
logging {
fileline: off
- to_logfile: yes
+ #to_logfile: no
+ #logfile: /var/log/cluster/corosync.log
to_syslog: yes
- logfile: /var/log/cluster/corosync.log
debug: off
timestamp: on
logger_subsys {
@@ -54,5 +56,5 @@ nodelist {
quorum {
# Enable and configure quorum subsystem (default: off)

20
corosync.changes
View File

@ -1,3 +1,23 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Wed Jul 2 05:48:47 UTC 2014 - yzou@suse.com
- Fixed shared memory leak.
+ 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
-------------------------------------------------------------------
Fri Apr 11 06:50:17 UTC 2014 - lzhong@suse.com
- Fix `systemctl stop pacemaker` leaves corosync running

8
corosync.spec
View File

@ -51,9 +51,10 @@ Source0: %{name}-%{version}.tar.gz
Source2: baselibs.conf
Patch1: corosync-init-lockfile-path-error.patch
Patch2: corosync-cts-api-error.patch
Patch3: corosync-conf-example.patch
Patch4: bnc#867767-add-version.patch
Patch5: bnc#872651-stop-cluster.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
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.
@ -103,6 +104,7 @@ Requires: libxslt
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
%build
#%if 0%{?buildtrunk} == 1