Accepting request 125084 from network:ha-clustering:Factory
Update to 1.4.3 stable release (fixes a bunch of bugs) OBS-URL: https://build.opensuse.org/request/show/125084 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/corosync?expand=0&rev=13
This commit is contained in:
Stephan Kulow
Git OBS Bridge
commit
57b0c7736f
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:1938d2ee839444191a83470bf54192ab0d2d63d2f74356055cb5c19249485aec
|
||||
size 311823
|
||||
3
corosync-1.4.3.tar.bz2
Normal file
3
corosync-1.4.3.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:13cfbf1c88f53c1ed0dd70b1fc438d10c46714d8146248aa4fe21bedc865b457
|
||||
size 565718
|
||||
@ -1,11 +1,11 @@
|
||||
Index: corosync-1.4.1/conf/corosync.conf.example
|
||||
Index: corosync-1.4.3/conf/corosync.conf.example
|
||||
===================================================================
|
||||
--- corosync-1.4.1.orig/conf/corosync.conf.example
|
||||
+++ corosync-1.4.1/conf/corosync.conf.example
|
||||
@@ -21,7 +21,7 @@ logging {
|
||||
to_syslog: yes
|
||||
logfile: /var/log/cluster/corosync.log
|
||||
debug: off
|
||||
--- corosync-1.4.3.orig/conf/corosync.conf.example
|
||||
+++ corosync-1.4.3/conf/corosync.conf.example
|
||||
@@ -69,7 +69,7 @@ logging {
|
||||
# Log messages with time stamps. When in doubt, set to on
|
||||
# (unless you are only logging to syslog, where double
|
||||
# timestamps can be annoying).
|
||||
- timestamp: on
|
||||
+ timestamp: off
|
||||
logger_subsys {
|
||||
|
||||
@ -1,3 +1,27 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 8 07:46:10 UTC 2012 - tserong@suse.com
|
||||
|
||||
- Update to corosync 1.4.3 stable release.
|
||||
- Add calls to missing object_find_destroy() to fix mem leaks
|
||||
- Free mem allocated by getaddrinfo
|
||||
- corosync.conf.example: change bindnetaddr, mcastaddr, add comments
|
||||
- Store error str if can't open logfile
|
||||
- Wait for corosync-notifyd exit in init script
|
||||
- iba: Use configured node id
|
||||
- Unlink shm buffers if init fails
|
||||
- Fix memory leaks when nss fails
|
||||
- Madvise NOSYNC flag only if available
|
||||
- Include net/if_var.h header only when needed
|
||||
- Include stdint.h because funcs uses int16_t
|
||||
- Use install instead of cp
|
||||
- Don't unlock mutex in different threads
|
||||
- Revert "Use install instead of cp"
|
||||
- Add support for per OS CP flags
|
||||
- Remove cloned lines in main of main.c
|
||||
- Fixed bug when corosync receive JoinMSG in OPERATIONAL state
|
||||
- Correct nodeid of token when we retransmit it
|
||||
- Correct nodeid in memb_state_commit_token_send function
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Feb 5 11:44:40 UTC 2012 - jjzhang@suse.com
|
||||
|
||||
|
||||
@ -1,77 +1,78 @@
|
||||
Index: corosync-1.4.1/conf/corosync.conf.example
|
||||
Index: corosync-1.4.3/conf/corosync.conf.example
|
||||
===================================================================
|
||||
--- corosync-1.4.1.orig/conf/corosync.conf.example
|
||||
+++ corosync-1.4.1/conf/corosync.conf.example
|
||||
@@ -1,10 +1,57 @@
|
||||
--- corosync-1.4.3.orig/conf/corosync.conf.example
|
||||
+++ corosync-1.4.3/conf/corosync.conf.example
|
||||
@@ -1,16 +1,59 @@
|
||||
# Please read the corosync.conf.5 manual page
|
||||
compatibility: whitetank
|
||||
|
||||
+aisexec {
|
||||
+ # Run as root - this is necessary to be able to manage
|
||||
+ # resources with Pacemaker
|
||||
+ user: root
|
||||
+ group: root
|
||||
+ user: root
|
||||
+ group: root
|
||||
+}
|
||||
+
|
||||
+service {
|
||||
+ # Load the Pacemaker Cluster Resource Manager
|
||||
+ ver: 0
|
||||
+ name: pacemaker
|
||||
+ use_mgmtd: yes
|
||||
+ use_logd: yes
|
||||
+ ver: 0
|
||||
+ name: pacemaker
|
||||
+ use_mgmtd: yes
|
||||
+ use_logd: yes
|
||||
+}
|
||||
+
|
||||
totem {
|
||||
- version: 2
|
||||
- secauth: off
|
||||
- threads: 0
|
||||
+ # The only valid version is 2
|
||||
+ version: 2
|
||||
+
|
||||
version: 2
|
||||
|
||||
+ # How long before declaring a token lost (ms)
|
||||
+ token: 5000
|
||||
+ token: 5000
|
||||
+
|
||||
+ # How many token retransmits before forming a new configuration
|
||||
+ token_retransmits_before_loss_const: 10
|
||||
+
|
||||
+ # How long to wait for join messages in the membership protocol (ms)
|
||||
+ join: 60
|
||||
+ join: 60
|
||||
+
|
||||
+ # How long to wait for consensus to be achieved before starting
|
||||
+ # a new round of membership configuration (ms)
|
||||
+ consensus: 6000
|
||||
+ consensus: 6000
|
||||
+
|
||||
+ # Turn off the virtual synchrony filter
|
||||
+ vsftype: none
|
||||
+ vsftype: none
|
||||
+
|
||||
+ # Number of messages that may be sent by one processor on
|
||||
+ # receipt of the token
|
||||
+ max_messages: 20
|
||||
+ max_messages: 20
|
||||
+
|
||||
+ # Limit generated nodeids to 31-bits (positive signed integers)
|
||||
+ clear_node_high_bit: yes
|
||||
+
|
||||
+ # Disable encryption
|
||||
+ secauth: off
|
||||
+
|
||||
# secauth: Enable mutual node authentication. If you choose to
|
||||
# enable this ("on"), then do remember to create a shared
|
||||
# secret with "corosync-keygen".
|
||||
secauth: off
|
||||
|
||||
+ # How many threads to use for encryption/decryption
|
||||
+ threads: 0
|
||||
+
|
||||
threads: 0
|
||||
|
||||
+ # Optionally assign a fixed node id (integer)
|
||||
+ # nodeid: 1234
|
||||
+ # nodeid: 124
|
||||
+
|
||||
interface {
|
||||
ringnumber: 0
|
||||
bindnetaddr: 192.168.1.1
|
||||
@@ -17,9 +64,9 @@ totem {
|
||||
logging {
|
||||
fileline: off
|
||||
# interface: define at least one interface to communicate
|
||||
# over. If you define more than one interface stanza, you must
|
||||
# also set rrp_mode.
|
||||
@@ -60,10 +103,11 @@ logging {
|
||||
to_stderr: no
|
||||
# Log to a log file. When set to "no", the "logfile" option
|
||||
# must not be set.
|
||||
- to_logfile: yes
|
||||
+ to_logfile: no
|
||||
to_syslog: 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
|
||||
+ syslog_facility: daemon
|
||||
# Log debug messages (very verbose). When in doubt, leave off.
|
||||
debug: off
|
||||
timestamp: off
|
||||
logger_subsys {
|
||||
# Log messages with time stamps. When in doubt, set to on
|
||||
|
||||
@ -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
|
||||
@ -28,10 +29,12 @@ Name: corosync
|
||||
Summary: The Corosync Cluster Engine and Application Programming Interfaces
|
||||
License: BSD-3-Clause
|
||||
Group: Productivity/Clustering/HA
|
||||
Version: 1.4.1
|
||||
Version: 1.4.3
|
||||
Release: 0
|
||||
Url: http://www.corosync.org
|
||||
Source0: http://developer.osdl.org/dev/openais/downloads/%{name}-%{version}/%{name}-%{version}.tar.bz2
|
||||
# Source from tar.gz, recompressed to bz2.
|
||||
# ftp://ftp:downloads@ftp.corosync.org/downloads/corosync-1.4.3/corosync-1.4.3.tar.gz
|
||||
Source0: %{name}-%{version}.tar.bz2
|
||||
Source2: baselibs.conf
|
||||
Patch1: corosync-confexample-timestamp.patch
|
||||
Patch2: corosync-revert-cs2429.patch
|
||||
@ -102,6 +105,9 @@ rm -rf %{buildroot}%{_docdir}/*
|
||||
# the docdir is /usr/share/doc/<pkg> in the configuration
|
||||
rm -rf %{buildroot}%{_datadir}/doc/*
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%description
|
||||
This package contains the Corosync Cluster Engine Executive, several
|
||||
default APIs and libraries, default configuration files, and an init
|
||||
@ -112,6 +118,7 @@ script.
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc LICENSE SECURITY
|
||||
%{_bindir}/corosync-blackbox
|
||||
%{_sbindir}/corosync
|
||||
%{_sbindir}/corosync-keygen
|
||||
%{_sbindir}/corosync-objctl
|
||||
@ -120,10 +127,9 @@ script.
|
||||
%{_sbindir}/corosync-pload
|
||||
%{_sbindir}/corosync-cpgtool
|
||||
%{_sbindir}/corosync-quorumtool
|
||||
%{_bindir}/corosync-blackbox
|
||||
%dir %{_sysconfdir}/corosync
|
||||
%dir %{_sysconfdir}/corosync/uidgid.d
|
||||
%dir %{_sysconfdir}/corosync/service.d
|
||||
%dir %{_sysconfdir}/corosync/uidgid.d
|
||||
%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example
|
||||
%config(noreplace) %{_sysconfdir}/corosync/corosync.conf.example.udpu
|
||||
%dir %{_libexecdir}/lcrso
|
||||
|
||||
Loading…
Reference in New Issue
Block a user