From nobody Sun Jul 13 18:24:51 2025 X-Original-To: dev-commits-src-main@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 4bgDPv6mB3z61JY6; Sun, 13 Jul 2025 18:24:51 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgDPv3f0Sz3tVs; Sun, 13 Jul 2025 18:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752431091; 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=yYkkP2RT7hcdjo9XsvcMP1EgPdpPcHyBc6sIPue57DU=; b=R+HTz1lcp5KLcO6pCGEP1rajXUzqB5H66+2Zdt0nTPTr+CpNYD7W5lkJr4LRdg6idZr7ZV ZWsWbdnaITTHciODJfYah8/eOqqJeO53DiKpnfch+ILPjBUDq1pNVJh3yB/UeH8Zkfiesq I5UY6ilm0kh8Dw1W4h/fQgJW5GwjRbQTppcUWoXr0VUNcJOR1fz8dNdBTjn2ZvrdfRFyOQ VIPou1Eubwp8uQcH4fd9pDdi/VhEKTLw50E41wkSD8iCtH9KBvxz65CbtLPTyAR5cTWtIO CBu1g/v3yeHlYsMZVdWa/uoD+PbLPXLX/95QoKykKRSXuBYkewu1uck/N3UQ7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752431091; 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=yYkkP2RT7hcdjo9XsvcMP1EgPdpPcHyBc6sIPue57DU=; b=bZWqyIWwOgfk+kFiTuUXlGIPrypXe4BHE9Mv99KCr/g1GcmRVKAhQltF8GufJY4zNTz4Y7 tZTlv10btL2uBRVt5/Cfioo/eG0IFJ7HHSLV9gRkdnImFijKOcimbX0+KnNWTpnsGEbzSH 4x5c/UXfvZvoRbHjmdAoywGjd/eq2KKrjRZHRfbxsIHtqU7+Unquua+JUPX2CkxpxFzuIG MjGbKdsjd4jum2cFqm87Y6gfODuz3ob9Ul2TtebK84LZTAEESfJVEczmQJkNrgwu3t/Tbx 2/JoGcbcEEubGfeHd5gR45BUz2OUipEKXJ8YFUY3omgoeOPUwOQr5UeS0d++mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752431091; a=rsa-sha256; cv=none; b=hJ+1CZAiphPlPGobgRWQL/8xfGFlAyq3A+MHqP8tOeSmFNxp85NRtZejylIii6V0dMiZZA wVs1PuT7cy3m+FKmh/vhXqq0pT3BxE0dhFmPMc1X3YDABvShJNY5DeKX9jIcb7xVlglH3J dM/phf8zNuf9hR1by7WLdw/uJyTkkhfDH3m/U6nzKWMXUrCzNrBJ9Nyst9Wa+UyOMM2X9S wUQHRRBH2KrW1brnP09slcn1vm9DBWLZGiG/1wJU0RP+bZdJCWIPuQB0ShDal3zhkE0YJi GLg4/R78aQzHJbJuYMCTcuEO30ugu3IP1yOyLFG/uQYNYQytCTchaIPbLAe6XA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgDPv2pP0z4kP; Sun, 13 Jul 2025 18:24:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56DIOpxD043826; Sun, 13 Jul 2025 18:24:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DIOpn0043823; Sun, 13 Jul 2025 18:24:51 GMT (envelope-from git) Date: Sun, 13 Jul 2025 18:24:51 GMT Message-Id: <202507131824.56DIOpn0043823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: da89500adbea - main - rc_subr_test: Bump some sleep timeouts List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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: da89500adbea360533d2442a674c8af0741b7ff1 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=da89500adbea360533d2442a674c8af0741b7ff1 commit da89500adbea360533d2442a674c8af0741b7ff1 Author: Mark Johnston AuthorDate: 2025-07-13 15:08:00 +0000 Commit: Mark Johnston CommitDate: 2025-07-13 18:24:36 +0000 rc_subr_test: Bump some sleep timeouts The test verifies that the rc framework will OOM-protect a process spawned by rc. It just wraps a 5-second /bin/sleep invocation as part of this test. The rc framework uses procctl to set the OOM-protect bit after the process has started, i.e., it uses procctl -p. So, with a 5 second timeout, it's possible for the process to exit before procctl actually runs, if the system is heavily loaded. (I see this failure occasionally with KMSAN configured and many tests running in parallel.) Bump the timeout to reduce the risk of this happening. The timeout value is arbitrary since the test will stop the rc process, i.e., we don't have to wait for 60 seconds to elapse before the test passes. MFC after: 1 week --- libexec/rc/tests/rc_subr_test.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/tests/rc_subr_test.sh b/libexec/rc/tests/rc_subr_test.sh index 60f77c2c2de3..9931389e7a02 100644 --- a/libexec/rc/tests/rc_subr_test.sh +++ b/libexec/rc/tests/rc_subr_test.sh @@ -52,7 +52,7 @@ oomprotect_all_body() _rc_arg="$4" setvar "${name}_oomprotect" all command="/usr/sbin/daemon" - command_args="-P $pidfile -p $_childpidfile -- /bin/sleep 5" + command_args="-P $pidfile -p $_childpidfile -- /bin/sleep 60" run_rc_command "$_rc_arg" LITERAL @@ -92,7 +92,7 @@ oomprotect_yes_body() setvar "${name}_oomprotect" yes procname="/bin/sleep" command="/usr/sbin/daemon" - command_args="-p $pidfile -- $procname 5" + command_args="-p $pidfile -- $procname 60" run_rc_command "$_rc_arg" LITERAL