rpm/corosync
SHA256
1
0
Fork 0
forked from pool/corosync
Code Pull Requests Activity

Accepting request 214141 from home:lisaseraph:branches:network:ha-clustering:Factory

Browse Source 
add patches to fix cts api wrong issues

OBS-URL: https://build.opensuse.org/request/show/214141
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/corosync?expand=0&rev=44
This commit is contained in:
xia li 2014-01-17 08:11:20 +00:00 committed by Git OBS Bridge
parent 7bfcaa481a
commit dea99888c1
4 changed files with 74 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
corosync-conf-example.patch Normal file
View File

@ -0,0 +1,44 @@
Index: corosync-2.3.2/conf/corosync.conf.example
===================================================================
--- corosync-2.3.2.orig/conf/corosync.conf.example
+++ corosync-2.3.2/conf/corosync.conf.example
@@ -9,6 +9,12 @@ totem {
crypto_cipher: none
crypto_hash: none
+ # Limit generated nodeids to 31-bits (positive signed integers)
+ # you would set it to 'yes', the new option 'new' means wiping
+ # off the highest bit in network order to avoid possible nodeid
+ # conflicting.
+ clear_node_high_bit: yes
+
# interface: define at least one interface to communicate
# over. If you define more than one interface stanza, you must
# also set rrp_mode.
@@ -77,5 +83,5 @@ logging {
quorum {
# Enable and configure quorum subsystem (default: off)
# see also corosync.conf.5 and votequorum.5
- #provider: corosync_votequorum
+ provider: corosync_votequorum
}
Index: corosync-2.3.2/conf/corosync.conf.example.udpu
===================================================================
--- corosync-2.3.2.orig/conf/corosync.conf.example.udpu
+++ corosync-2.3.2/conf/corosync.conf.example.udpu
@@ -5,6 +5,8 @@ totem {
crypto_cipher: none
crypto_hash: none
+ clear_node_high_bit: yes
+
interface {
ringnumber: 0
bindnetaddr: 10.16.35.0
@@ -54,5 +56,5 @@ nodelist {
quorum {
# Enable and configure quorum subsystem (default: off)
# see also corosync.conf.5 and votequorum.5
- #provider: corosync_votequorum
+ provider: corosync_votequorum
}

17
corosync-cts-api-error.patch Normal file
View File

@ -0,0 +1,17 @@
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"])

8
corosync.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Jan 9 09:14:50 UTC 2014 - xli@suse.com
- Add patch to fix cts api wrong issue
+ corosync-cts-api-error.patch
- Add patch to change default settings of conf.example
+ corosync-conf-example.patch
-------------------------------------------------------------------
Thu Dec 12 06:35:17 UTC 2013 - xli@suse.com

6
corosync.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package corosync
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2014 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
@ -50,6 +50,8 @@ 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: corosync-conf-example.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# openais is indeed gone and should be uninstalled. No, we do not
# provide openais on purpose, the package has been deleted.
@ -96,6 +98,8 @@ Requires: libxslt
%prep
%setup -q -n %{name}-%{version}
%patch1 -p1
%patch2 -p1
%patch3 -p1
%build
#%if 0%{?buildtrunk} == 1