diff --git a/.corosync.metadata b/.corosync.metadata index b2ed6f2..7942f9e 100644 --- a/.corosync.metadata +++ b/.corosync.metadata @@ -1,2 +1,2 @@ -7c0c4156efb6625d8eb5be3999275769d3c63890 SOURCES/corosync-3.0.2.tar.gz -3c1904b844ec7e1b96f47ef92e4da2d99441c5f0 SOURCES/spausedd-20190320.tar.gz +dea662d9ae9a624196e3f116a29cece2eb979616 SOURCES/corosync-3.0.3.tar.gz +87cb5c01333298d106fc0022f5ac855205da0ae6 SOURCES/spausedd-20190807.tar.gz diff --git a/.gitignore b/.gitignore index b0fcd13..0833995 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/corosync-3.0.2.tar.gz -SOURCES/spausedd-20190320.tar.gz +SOURCES/corosync-3.0.3.tar.gz +SOURCES/spausedd-20190807.tar.gz diff --git a/SOURCES/bz1765619-1-totemsrp-Reduce-MTU-to-left-room-second-mcast.patch b/SOURCES/bz1765619-1-totemsrp-Reduce-MTU-to-left-room-second-mcast.patch deleted file mode 100644 index fe5a375..0000000 --- a/SOURCES/bz1765619-1-totemsrp-Reduce-MTU-to-left-room-second-mcast.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ee8b8993d98b3f6af9c058194228fc534fcd0796 Mon Sep 17 00:00:00 2001 -From: Jan Friesse -Date: Mon, 7 Oct 2019 15:26:22 +0200 -Subject: [PATCH] totemsrp: Reduce MTU to left room second mcast - -Messages sent during recovery phase are encapsulated so such message has -extra size of mcast structure. This is not so big problem for UDPU, -because most of the switches are able to fragment and defragment packet -but it is problem for knet, because totempg is using maximum packet size -(65536 bytes) and when another header is added during retransmition, -then packet is too large. - -Solution is to reduce mtu by 2 * sizeof (struct mcast). - -Signed-off-by: Jan Friesse -Reviewed-by: Fabio M. Di Nitto ---- - exec/totemsrp.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/exec/totemsrp.c b/exec/totemsrp.c -index 548f1dc..0caded0 100644 ---- a/exec/totemsrp.c -+++ b/exec/totemsrp.c -@@ -803,7 +803,7 @@ static void totempg_mtu_changed(void *context, int net_mtu) - { - struct totemsrp_instance *instance = context; - -- instance->totem_config->net_mtu = net_mtu - sizeof (struct mcast); -+ instance->totem_config->net_mtu = net_mtu - 2 * sizeof (struct mcast); - - log_printf (instance->totemsrp_log_level_debug, - "Net MTU changed to %d, new value is %d", -@@ -5112,7 +5112,7 @@ void main_iface_change_fn ( - } - - void totemsrp_net_mtu_adjust (struct totem_config *totem_config) { -- totem_config->net_mtu -= sizeof (struct mcast); -+ totem_config->net_mtu -= 2 * sizeof (struct mcast); - } - - void totemsrp_service_ready_register ( --- -1.8.3.1 - diff --git a/SPECS/corosync.spec b/SPECS/corosync.spec index e7c3dca..52a04ec 100644 --- a/SPECS/corosync.spec +++ b/SPECS/corosync.spec @@ -17,18 +17,17 @@ %global gittarver %{?numcomm:.%{numcomm}}%{?alphatag:-%{alphatag}}%{?dirty:-%{dirty}} %if %{with spausedd} -%global spausedd_version 20190320 +%global spausedd_version 20190807 %endif Name: corosync Summary: The Corosync Cluster Engine and Application Programming Interfaces -Version: 3.0.2 -Release: 3%{?gitver}%{?dist}.1 +Version: 3.0.3 +Release: 2%{?gitver}%{?dist} License: BSD URL: http://corosync.github.io/corosync/ Source0: http://build.clusterlabs.org/corosync/releases/%{name}-%{version}%{?gittarver}.tar.gz -Patch0: bz1765619-1-totemsrp-Reduce-MTU-to-left-room-second-mcast.patch %if %{with spausedd} Source1: https://github.com/jfriesse/spausedd/releases/download/%{spausedd_version}/spausedd-%{spausedd_version}.tar.gz # VMGuestLib exists only for x86_64 architecture @@ -90,8 +89,6 @@ BuildRequires: pkgconfig(vmguestlib) %setup -q -n %{name}-%{version}%{?gittarver} %endif -%patch0 -p1 -b .bz1765619-1 - %build %if %{with runautogen} ./autogen.sh @@ -390,11 +387,30 @@ fi %endif %changelog -* Wed Oct 30 2019 Jan Friesse 3.0.2-3.1 -- Resolves: rhbz#1765619 +* Mon Nov 25 2019 Jan Friesse - 3.0.3-2 +- Related: rhbz#1745623 + +- New upstream release of spausedd + +* Mon Nov 25 2019 Jan Friesse - 3.0.3-1 +- Resolves: rhbz#1745623 + +- New upstream release + +* Wed Oct 30 2019 Jan Friesse 3.0.2-4 +- Resolves: rhbz#1745624 +- Resolves: rhbz#1745642 +- Resolves: rhbz#1749263 +- Resolves: rhbz#1765025 -- totemsrp: Reduce MTU to left room second mcast (rhbz#1765619) -- merge upstream commit ee8b8993d98b3f6af9c058194228fc534fcd0796 (rhbz#1765619) +- totem: fix check if all nodes have same number of links (rhbz#1749263) +- merge upstream commit 816324c94cfb917b11f43954b8757424db28b390 (rhbz#1749263) +- totem: Increase ring_id seq after load (rhbz#1745624) +- merge upstream commit 3675daceeeeb72af043f5c051daed463fdd2d2a1 (rhbz#1745624) +- man: Fix link_mode priority description (rhbz#1745642) +- merge upstream commit 0a323ff2ed0f2aff9cb691072906e69cb96ed662 (rhbz#1745642) +- totemsrp: Reduce MTU to left room second mcast (rhbz#1765025) +- merge upstream commit ee8b8993d98b3f6af9c058194228fc534fcd0796 (rhbz#1765025) * Tue Aug 06 2019 Jan Friesse - 3.0.2-3 - Resolves: rhbz#1738218