From nobody Thu Jan 22 17:17:58 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 4dxnng1QVrz6Q4Qk for ; Thu, 22 Jan 2026 17:17:59 +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 4dxnnf4Rgsz3fKq for ; Thu, 22 Jan 2026 17:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769102278; 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=OMATC7mnO0otYXpiGOtNxsibzMHICGw1EX2KVnqc/34=; b=S8xmIY1KJL0KAtFa00vpmDhf424qnYsJkx4cvWx5kKWt3/GxJszwDDFV+as1O+mojZtv33 F92vvcUZBfjID6rmvzZM1SwR+Ztw8VgKtmMTRBKq2VVA+1jjCwLSIA621mpuMxQp1Eqmd7 ZlEQHM0U38hU79DBd7NsNdPX6al8z8rDFdS+GCrFUy4x12zFfl28TOfke+FU26eZYWLAGw 3KADcxVWwddAvP/cdqDOkCncnFaH7ZylkJZPahPduO6Gbj/WT3iw1K2j0sgaY+OYVgLEUl /h+dPXSzGvPg8Oes4niER0ly3QNar5O6sIlbJmi/bUqFsA8VlBFzyud6Io2G9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769102278; 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=OMATC7mnO0otYXpiGOtNxsibzMHICGw1EX2KVnqc/34=; b=Ek6V1fhJ440n6BB36wFAEGhDD061hFPiprPtdSwVxIw0sJw+VJsi+8XYNhWncR7YhUOnKS RblA3ih4JWyhMS/khhrtxzN/kAO4MGZr4EIfAagKRe53HjwAcCtzrmpCkgfK9MTnc4Ehte LsWabwUItnQbVgNrI7MPsK3uZfEmJJP5oQwISbA2QlCn/mixLxDpL/dfbJuz1K4S9v7BH/ ewOPJwWnCPFcbQbJbP+w4do/lJbSP1eT74Udo3F19cbUoXri/6BVjGHp29e5h6cA749jC/ jqgE9w7hUheAScvdEnnOIPaeW6gruPqndvo361AwDak5Pr9c/edhd8MpexfQfg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769102278; a=rsa-sha256; cv=none; b=ZxJZHLteZeJ3TVchOv+LeZmhQdozZTNbGP5paaTMeEuMBoUnrqPgqW7L1HgbZWyZPY/c6n iYLoFO5Lz9aC8kqZ4rEQ+TbV9S7uftvdsgtvKwYMqeeh0//wxb3OXKtVrTYvDgOssvM0nG ieGKn2Rrf6yUYYvw9QsIZdhIwi1xODDmbus6LKBWYm34kQY6DbmEbPbnpxBqozE0gGULPX EJkt0SyLeFGGvOfb3WN3srBqenvZU1n0trh6+A3ixhw3/vQKH+UDTKZxQ+M3/0RqcO/ilw Kqk6aDiFAa1FyzGQBjEi5g3NCvmc+dd5z+iagzq4pUIC0BNBYUBp+dP9kkbqQA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dxnnf19hWzjCj for ; Thu, 22 Jan 2026 17:17:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3a34c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 22 Jan 2026 17:17:58 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 14dce731d706 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 14dce731d70686e08ed689729f53c6a5e2225498 Auto-Submitted: auto-generated Date: Thu, 22 Jan 2026 17:17:58 +0000 Message-Id: <69725bc6.3a34c.90c1bb0@gitrepo.freebsd.org> The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=14dce731d70686e08ed689729f53c6a5e2225498 commit 14dce731d70686e08ed689729f53c6a5e2225498 Author: Mark Johnston AuthorDate: 2026-01-22 15:52:00 +0000 Commit: Mark Johnston CommitDate: 2026-01-22 15:52:00 +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 --- 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"