Attachment 17826 Details for Bug 15328 – Patch in master backported to Samba 4.17 and 4.18

[patch] Patch in master backported to Samba 4.17 and 4.18

0001-tsocket-Increase-tcp_user_timeout-max_loops.patch (text/plain), 1.38 KB, created by Andrew Bartlett on 2023-03-15 19:29:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Bartlett

Created: 2023-03-15 19:29:02 UTC

Size: 1.38 KB

patch

obsolete

>From 071b4a04a1838eac1bd6c62c7779de50f8057095 Mon Sep 17 00:00:00 2001
>From: Andrew Bartlett <abartlet@samba.org>
>Date: Thu, 9 Mar 2023 10:06:26 +1300
>Subject: [PATCH] tsocket: Increase tcp_user_timeout max_loops
>
>Often, on rackspace GitLab CI runners, we get:
>
>UNEXPECTED(failure): samba.unittests.tsocket_tstream.test_tstream_more_tcp_user_timeout_spin(none)
>REASON: Exception: Exception: 0xf == 0xf
>../../lib/tsocket/tests/test_tstream.c:405: error: Failure!
>
>This allows us more spins before we fail the test.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15328
>Signed-off-by: Andrew Bartlett <abartlet@samba.org>
>Reviewed-by: Joseph Sutton <josephsutton@catalyst.net.nz>
>(cherry picked from commit 5a7a28cc45870949fc11d30586a06c309aa517dc)
>---
> lib/tsocket/tests/test_tstream.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/lib/tsocket/tests/test_tstream.c b/lib/tsocket/tests/test_tstream.c
>index a920e671cda..47008bb8bf8 100644
>--- a/lib/tsocket/tests/test_tstream.c
>+++ b/lib/tsocket/tests/test_tstream.c
>@@ -322,7 +322,7 @@ static void test_tstream_server_spin_client_tcp_user_timeout(struct socket_pair
> 	rc = write(sp->socket_client, TEST_STRING, sizeof(TEST_STRING));
> 	assert_return_code(rc, errno);
> 	sp->expected_errno = ETIMEDOUT;
>-	sp->max_loops = 15;
>+	sp->max_loops = 30;
> }
> 
> static void test_tstream_server_spin_client_both_timer(struct tevent_context *ev,
>-- 
>2.25.1
>

Flags:

jsutton: review+

Actions: View

Attachments on bug 15328: 17826