Version in base suite: 3.0.1-2 Base version: corosync_3.0.1-2 Target version: corosync_3.0.1-2+deb10u1 Base file: /srv/ftp-master.debian.org/ftp/pool/main/c/corosync/corosync_3.0.1-2.dsc Target file: /srv/ftp-master.debian.org/policy/pool/main/c/corosync/corosync_3.0.1-2+deb10u1.dsc changelog | 7 + gbp.conf | 2 patches/series | 1 patches/totemsrp-Reduce-MTU-to-left-room-second-mcast.patch | 43 ++++++++++++ 4 files changed, 52 insertions(+), 1 deletion(-) diff -Nru corosync-3.0.1/debian/changelog corosync-3.0.1/debian/changelog --- corosync-3.0.1/debian/changelog 2019-02-03 23:31:24.000000000 +0000 +++ corosync-3.0.1/debian/changelog 2020-03-06 10:27:50.000000000 +0000 @@ -1,3 +1,10 @@ +corosync (3.0.1-2+deb10u1) buster; urgency=medium + + * [c7ca027] New patch: totemsrp: Reduce MTU to left room second mcast. + Thanks to Jan Friesse (Closes: #950476) + + -- Ferenc Wágner Fri, 06 Mar 2020 11:27:50 +0100 + corosync (3.0.1-2) unstable; urgency=medium * [70f53cb] Switch to Debhelper level 12. diff -Nru corosync-3.0.1/debian/gbp.conf corosync-3.0.1/debian/gbp.conf --- corosync-3.0.1/debian/gbp.conf 2019-02-03 10:42:36.000000000 +0000 +++ corosync-3.0.1/debian/gbp.conf 2020-03-06 10:25:58.000000000 +0000 @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = debian/master +debian-branch = debian/buster upstream-branch = upstream/latest [import-orig] diff -Nru corosync-3.0.1/debian/patches/series corosync-3.0.1/debian/patches/series --- corosync-3.0.1/debian/patches/series 2019-02-03 10:42:36.000000000 +0000 +++ corosync-3.0.1/debian/patches/series 2020-03-06 10:26:49.000000000 +0000 @@ -6,3 +6,4 @@ AC_PROG_SED-is-already-present.patch Use-the-SED-variable-provided-by-configure.patch Use-the-AWK-variable-provided-by-configure.patch +totemsrp-Reduce-MTU-to-left-room-second-mcast.patch diff -Nru corosync-3.0.1/debian/patches/totemsrp-Reduce-MTU-to-left-room-second-mcast.patch corosync-3.0.1/debian/patches/totemsrp-Reduce-MTU-to-left-room-second-mcast.patch --- corosync-3.0.1/debian/patches/totemsrp-Reduce-MTU-to-left-room-second-mcast.patch 1970-01-01 00:00:00.000000000 +0000 +++ corosync-3.0.1/debian/patches/totemsrp-Reduce-MTU-to-left-room-second-mcast.patch 2020-03-06 10:26:49.000000000 +0000 @@ -0,0 +1,43 @@ +From: Jan Friesse +Date: Mon, 7 Oct 2019 15:26:22 +0200 +Subject: 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 + +Closes: #950476 +--- + exec/totemsrp.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/exec/totemsrp.c b/exec/totemsrp.c +index ab27924..d846a0f 100644 +--- a/exec/totemsrp.c ++++ b/exec/totemsrp.c +@@ -805,7 +805,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", +@@ -5093,7 +5093,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 (