From nobody Mon Feb 9 18:04:20 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f8sys0XBhz6RnjK for ; Mon, 09 Feb 2026 18:04:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8syr59QZz3tT4 for ; Mon, 09 Feb 2026 18:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770660260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yoMs53pU/KzGIscAevOS5BoMirM95AgpK0U/+D+9FMA=; b=TA2fSyikWLHKb4c1PtGtdUQS48tfnGM7JEhdXdniKbnRa46Udl93k4r7jxdqPUpTHDlHc8 KQhEDF8cJn99Bo51mSrNPtaKTTswt4GXlPUDnepdj8v6k3Zi92my9fG1fqq6BjfEGhG5jw E1noCYlpwr9A0RLaoXY5mPsenzvYNbBQIfzJrgMPjp6mCMIayAMPMs0K0DIExrU0WHr22T bRj2AhmJJPdj72fNyH6EDTroxfYQPNVKGUej7eIM0m8xpOXKm18R8NJXtkNdOEyO98yJQo 5bVw3MHxg5L+bqCGfi8q+drXG21Go1AF9t03LKnv6UGw8owoKRos1DFy1qQxhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770660260; a=rsa-sha256; cv=none; b=W+GmFHkilsMTbbau3Hqy+6gMOegrP/JzCYsvh0snbZCD3mUz1JtN6Wmxqb++C7I6Ep8ou7 glz+K27fHoek5jAGhtxVT1BfmPqexg3Rw5L+50y8VsZVtJysrAEFp2YbFFEc3hfaXu8Wvn X+C2lX2rCobXXdvDHWN0DX2uMzsA/Y5n45b/Fxzn8oyItOvtI4wh3r059knff1ROnZx7YP pAheCymqeBhFBzOMQULaBgxBPrjJdV6TU7m2y1a5H6B++sVtnB1nRARhWShdHE9tTa1rIC Ip+zvt0VSUzQeZC5OIcILTYOlILAbV6o0XNOZ+0Bv6uv6sUVQG0tIGzhTfMHoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770660260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yoMs53pU/KzGIscAevOS5BoMirM95AgpK0U/+D+9FMA=; b=i/tnK7kqv24FADqove5CYet5bMhV6BkE1V2bH7bN/5wdFtq84u/c3RkkGQONYmgpV3mnrj yYJOljFd53S09EBDF4wcyn9mgC4o5l2XLeIhWNJd6LxLdJyB/ZGYpVaBV/R4aX/P23dKri WjVdGeCr9PryzbsoYQfmAMPnQ9X9xtNZnMDzGrhUWsjm/+2A+9aIxtdfwyFsXZB02Qwhov 1r5UQrULrY4DRjgvfLV/XzeL3M8UX88jf7NhnJML/G3R0Afas/BE3ver86NP4ndqnSmAN8 PUsxPfX8kEK4eBZQXipg1s8WPK+vBECxhAJhdrSU403XyWWvUCuEKG/6G7QOgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8syr49XpzkjJ for ; Mon, 09 Feb 2026 18:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 25fb4 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 18:04:20 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 0e6751669fc5 - stable/15 - syslogd/tests: Fix flakiness in forwarding tests List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 0e6751669fc52477bc1ce90fc5fb54eab840a581 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 18:04:20 +0000 Message-Id: <698a21a4.25fb4.15263d6@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=0e6751669fc52477bc1ce90fc5fb54eab840a581 commit 0e6751669fc52477bc1ce90fc5fb54eab840a581 Author: Mark Johnston AuthorDate: 2026-01-22 15:52:00 +0000 Commit: Mark Johnston CommitDate: 2026-02-09 18:03:42 +0000 syslogd/tests: Fix flakiness in forwarding tests syslogd_start() waits for the local log socket to appear before returning, to ensure that the daemon is ready to handle log messages. Some tests start two daemons, so by default the socket already exists when the second daemon is started, so syslogd_start() returns early. The test subsequently sends a message to this second daemon, which sometimes isn't ready. Define a separate log socket for the second daemon. Add a check to syslogd_start() to help catch this type of bug. Reviewed by: jlduran MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D54800 (cherry picked from commit 14dce731d70686e08ed689729f53c6a5e2225498) --- usr.sbin/syslogd/tests/syslogd_test.sh | 8 +++++--- usr.sbin/syslogd/tests/syslogd_test_common.sh | 9 +++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/usr.sbin/syslogd/tests/syslogd_test.sh b/usr.sbin/syslogd/tests/syslogd_test.sh index d4723b9e05b3..1f235c476c49 100644 --- a/usr.sbin/syslogd/tests/syslogd_test.sh +++ b/usr.sbin/syslogd/tests/syslogd_test.sh @@ -452,7 +452,7 @@ allowed_peer_forwarding_body() printf "+169.254.0.2\nuser.debug\t${SYSLOGD_LOGFILE}\n" > "${SYSLOGD_CONFIG}" syslogd_start -j syslogd_allowed_peer -P ${SYSLOGD_PIDFILE}.2 \ - -b 169.254.0.1:514 -a 169.254.0.2/32 + -b 169.254.0.1:514 -a 169.254.0.2/32 -p ${PWD}/peer # A message forwarded to 169.254.0.1:514 should be logged, but one # forwarded to 169.254.0.1:515 should not. @@ -544,8 +544,10 @@ mail.debug ${SYSLOGD_LOGFILE} ftp.debug ${SYSLOGD_LOGFILE} __EOF__ - syslogd_start -j syslogd_server -f ${PWD}/server_config -b 169.254.0.1 -b 169.254.0.2 - syslogd_start -j syslogd_client -f ${PWD}/client_config -P ${SYSLOGD_PIDFILE}.2 + syslogd_start -j syslogd_server -f ${PWD}/server_config \ + -b 169.254.0.1 -b 169.254.0.2 + syslogd_start -j syslogd_client -f ${PWD}/client_config \ + -p ${PWD}/client -P ${SYSLOGD_PIDFILE}.2 syslogd_log_jail syslogd_client \ -h 169.254.0.3 -P $SYSLOGD_UDP_PORT -p user.debug -t test1 "hello, world" diff --git a/usr.sbin/syslogd/tests/syslogd_test_common.sh b/usr.sbin/syslogd/tests/syslogd_test_common.sh index 2f21137cf026..47fca62e66d0 100644 --- a/usr.sbin/syslogd/tests/syslogd_test_common.sh +++ b/usr.sbin/syslogd/tests/syslogd_test_common.sh @@ -68,6 +68,11 @@ syslogd_start() esac done + socket=${socket:-${SYSLOGD_LOCAL_SOCKET}} + if [ -S "${socket}" ]; then + atf_fail "socket ${socket} already exists" + fi + # Setup loopback so we can deliver messages to ourself. if [ $($jail sysctl -n security.jail.vnet) -ne 0 ]; then atf_check $jail ifconfig lo0 inet 127.0.0.1/8 @@ -80,7 +85,7 @@ syslogd_start() -f "${conf_file:-${SYSLOGD_CONFIG}}" \ -H \ -P "${pid_file:-${SYSLOGD_PIDFILE}}" \ - -p "${socket:-${SYSLOGD_LOCAL_SOCKET}}" \ + -p "${socket}" \ -S "${privsocket:-${SYSLOGD_LOCAL_PRIVSOCKET}}" \ ${other_args} \ & @@ -92,7 +97,7 @@ syslogd_start() done fi while [ "$((i+=1))" -le 20 ]; do - [ -S "${socket:-${SYSLOGD_LOCAL_SOCKET}}" ] && return + [ -S "${socket}" ] && return sleep 0.1 done atf_fail "timed out waiting for syslogd to start"