netbird/gvisor
0
0
Fork 0
mirror of https://github.com/netbirdio/gvisor.git synced 2026-05-22 17:12:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Increase timeout when polling for ICMP errors

Browse Source 
We're seeing occasional flakes in CQ in which the ICMP error isn't received in
time. Double the timeout from 1s to 2s.

PiperOrigin-RevId: 487035507
This commit is contained in:
Nick Brown
2022-11-08 13:24:33 -08:00
committed by gVisor bot
parent d8aa09e04c
commit 21b9d59950
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/syscalls/linux/udp_socket.cc
+8 -5
View File
@@ -53,6 +53,8 @@ namespace testing {
namespace {
constexpr size_t kIcmpTimeout = 2000;
// Fixture for tests parameterized by the address family to use (AF_INET and
// AF_INET6) when creating sockets.
class UdpSocketTest : public ::testing::TestWithParam<int> {
@@ -395,9 +397,9 @@ TEST_P(UdpSocketTest, ConnectWriteToInvalidPort) {
SyscallSucceedsWithValue(sizeof(buf)));
// Poll to make sure we get the ICMP error back.
constexpr int kTimeout = 1000;
struct pollfd pfd = {sock_.get(), POLLERR, 0};
ASSERT_THAT(RetryEINTR(poll)(&pfd, 1, kTimeout), SyscallSucceedsWithValue(1));
ASSERT_THAT(RetryEINTR(poll)(&pfd, 1, kIcmpTimeout),
SyscallSucceedsWithValue(1));
// Now verify that we got an ICMP error back of ECONNREFUSED.
int err;
@@ -799,10 +801,10 @@ TEST_P(UdpSocketTest, ConnectAndSendNoReceiver) {
EXPECT_THAT(send(sock_.get(), buf, sizeof(buf), 0),
SyscallSucceedsWithValue(sizeof(buf)));
constexpr int kTimeout = 1000;
// Poll to make sure we get the ICMP error back before issuing more writes.
struct pollfd pfd = {sock_.get(), POLLERR, 0};
ASSERT_THAT(RetryEINTR(poll)(&pfd, 1, kTimeout), SyscallSucceedsWithValue(1));
ASSERT_THAT(RetryEINTR(poll)(&pfd, 1, kIcmpTimeout),
SyscallSucceedsWithValue(1));
// Next write should fail with ECONNREFUSED due to the ICMP error generated in
// response to the previous write.
@@ -814,7 +816,8 @@ TEST_P(UdpSocketTest, ConnectAndSendNoReceiver) {
ASSERT_THAT(send(sock_.get(), buf, sizeof(buf), 0), SyscallSucceeds());
// Poll to make sure we get the ICMP error back before issuing more writes.
ASSERT_THAT(RetryEINTR(poll)(&pfd, 1, kTimeout), SyscallSucceedsWithValue(1));
ASSERT_THAT(RetryEINTR(poll)(&pfd, 1, kIcmpTimeout),
SyscallSucceedsWithValue(1));
// Next write should fail with ECONNREFUSED due to the ICMP error generated in
// response to the previous write.