From nobody Tue Jul 29 12:49:11 2025 X-Original-To: dev-commits-src-branches@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 4brwCD4Vy3z62xL0; Tue, 29 Jul 2025 12:49:12 +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 4brwCD0GvMz3ldv; Tue, 29 Jul 2025 12:49:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753793352; 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=YetsfsM8lpe4xd3WSa9wpRHFxJ9xdqHUEziY4SmgmtE=; b=qwMQAgq5ghVHr/sLyT9rFiaJ6NUGTI8Gpd7g8ephgh0zi8oCS2oEz8ptVn/4sgPUJz0vTE nw975bnADgvC9qVON+NaBhkelu/7IUGhDQ09WoKFLQN9tLv97kLWlwFJ5ykt1PxnoXgYQm dkq6zI2qGVMc4BuL51+UuJHCLpuQtzsWVza1k/Uw2j08LkLjBEk6R/T7QQu5WoM4jOCIxZ XjSCtCK2rRdpLog72fViMYAP5ZrMGoJ/3xEER6leby5hyVRZJfl/9HkQ6kPbWwZzFx5e75 dPGgTSEgLOhnjfzrpcXo2GgDW7AQJ//ukm9lMslEvO0B+Y8ZTC5xGNcimb5Jxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753793352; 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=YetsfsM8lpe4xd3WSa9wpRHFxJ9xdqHUEziY4SmgmtE=; b=VI4nRle4ahEweliq4Zv47q0JpzGDrh3g4SFsoWqOTiam/uqbvmYsr2Wpcs2q6qt9IvPT1b UIm8bLjam/C/knuAH4S3qiEJ0+CiOxrQqi29Du53TP9oJUeoTM+R1X7xqmtUpMSWzQixep B5KJE3+v4yCV66F96ZRXawEUzE9sAObrzO3vVXn+9zU6Eq0d+CdShhrSpo0Fo59aqeeoki o/au36Nzaw7ttQkjauFu9t9iYHQojzXSllBfVznzqNbwf5Tg1/1UqEi4zq7SKcT7DJE71n qFgkZFKqY94CN2Zj2vWoYTR+N0Y/STDoCsNjHEyxkveGo7tWbiEYVPJL+MpE6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753793352; a=rsa-sha256; cv=none; b=I7hLq9Jsnwu8Yz4xh7/gMKMVoA5VvO8BdVgDdm6H/UBzfZv+LV5dNE0DI2WyE3TZCKnf5n xFe7mSxjsozydyKHCo6NfduG8Gv2FSDlzs5WwvbugvfYH6joP9Rgu4Jzm8xBMmv5JCFKIy 4GGkS18mgsRQZwpxvmdmcbj7ksyKqloVjm8bWSoX8/cnNtyQxpktCST8NRede649MTeE1Z DdEGn+Jqjrp3GWgFgziVwS1tGkl46QYBOfuwfkG1BJfEbarm0aLpce9p4a2O0tT2ZuE4qg RqJ/sWM4kWyfiIZpXIqysV+oRtMxX0KrSB/XICpXgVyqT59ISLYNX9iKkiGp/A== 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 4brwCC5XRVzXVr; Tue, 29 Jul 2025 12:49:11 +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 56TCnBhA033600; Tue, 29 Jul 2025 12:49:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56TCnBCk033597; Tue, 29 Jul 2025 12:49:11 GMT (envelope-from git) Date: Tue, 29 Jul 2025 12:49:11 GMT Message-Id: <202507291249.56TCnBCk033597@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 12718429e89f - stable/14 - rc_subr_test: Bump some sleep timeouts List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/14 X-Git-Reftype: branch X-Git-Commit: 12718429e89f1fe64ebe2865db562f2f2296c7a9 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=12718429e89f1fe64ebe2865db562f2f2296c7a9 commit 12718429e89f1fe64ebe2865db562f2f2296c7a9 Author: Mark Johnston AuthorDate: 2025-07-13 15:08:00 +0000 Commit: Mark Johnston CommitDate: 2025-07-29 12:08:32 +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 (cherry picked from commit da89500adbea360533d2442a674c8af0741b7ff1) --- 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