svn commit: r366159 - head/tests/sys/netinet

Olivier Cochard olivier at FreeBSD.org
Fri Sep 25 16:02:14 UTC 2020


Author: olivier (ports committer)
Date: Fri Sep 25 16:02:13 2020
New Revision: 366159
URL: https://svnweb.freebsd.org/changeset/base/366159

Log:
  Enable SO_LINGER to the so_reuseport_lb_test regression tests, preventing
  many sockets in TIME_WAIT state at the end of the test.
  
  PR:		249885
  Reviewed by:	markj
  Approved by:	markj
  Sponsored by:	Netflix
  Differential Revision:	https://reviews.freebsd.org/D26549

Modified:
  head/tests/sys/netinet/so_reuseport_lb_test.c

Modified: head/tests/sys/netinet/so_reuseport_lb_test.c
==============================================================================
--- head/tests/sys/netinet/so_reuseport_lb_test.c	Fri Sep 25 13:59:50 2020	(r366158)
+++ head/tests/sys/netinet/so_reuseport_lb_test.c	Fri Sep 25 16:02:13 2020	(r366159)
@@ -54,6 +54,7 @@ lb_simple_accept_loop(int domain, const struct sockadd
 	size_t i;
 	int *acceptcnt;
 	int csd, error, excnt, sd;
+	const struct linger lopt = { 1, 0 };
 
 	/*
 	 * We expect each listening socket to accept roughly nconns/nsds
@@ -71,6 +72,10 @@ lb_simple_accept_loop(int domain, const struct sockadd
 
 		error = connect(sd, addr, addr->sa_len);
 		ATF_REQUIRE_MSG(error == 0, "connect() failed: %s",
+		    strerror(errno));
+
+		error = setsockopt(sd, SOL_SOCKET, SO_LINGER, &lopt, sizeof(lopt));
+		ATF_REQUIRE_MSG(error == 0, "Setting linger failed: %s",
 		    strerror(errno));
 
 		/*


More information about the svn-src-all mailing list