From nobody Mon Oct 28 22:43:23 2024 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 4XcpMH2yXYz5bsQw; Mon, 28 Oct 2024 22:43:23 +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 4XcpMH2Skwz55NK; Mon, 28 Oct 2024 22:43:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730155403; 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=ZHXj7BNoDNemrpJyDbRIY8ogimbcbdOxT4UD3Rzwq7Q=; b=bqgCmBflook4k2p6+TOCnEPVE7b7AtcIX9xd52oJ2ZJfji8LxPfTzSw0o9IIxuxSozU6n8 1GbfPWMaM2s4/x84Qt1ilj53fzSf54T/Bu10ZB7F0nK0xXBX4WSQ+F/TQnnuC66//1x9VL +km+VDPsJ5ky9mq5kBop+j8MvCkGoztnjY+m3yaZ1jz4GwnoWbFkI0xSiz8CTje9Dr31TR ToQoIoaVRbmpst1c3S4qAEpUJDAY9kIL6BCCvfeZOrHsQZ2sETHzkMhS29EyY6KUR23A4Z 1AxAcJ9WpqjD/dlpE5eb0r2FtcLeNrJyT7r8lxaDfSF40o/vI1UjvHDHFI5TUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1730155403; 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=ZHXj7BNoDNemrpJyDbRIY8ogimbcbdOxT4UD3Rzwq7Q=; b=qF9RJ++M8OA5EAzPJx41QQl+8fB26+0Qna4eJOq7vQKllxBS1oG8oS5/qCb9rPx9FnkhIK 0aEh0MAZguPnxNB2pS1L9QHS0YxvnBUCCpk/pRdGqTY9M6sdEi5NwvG7rmpMOaRlo1Vm9+ l/H+vnM6NdbDB4RfB7L+Ico9STdiC+qLs29S2bOESxaRxrYPbSH1GfvXuq0CH2tMltHpYf sgJyADVJ1XbhTJGMNDryGBjyY5duPQv3tadT5JJVQaFsRcD1zgyyWHtyzGztMv8/i/g+6h Y+lRZw5YAXqf3k7nOx39kqqyUXt2tW182VOXRNhheV2ZHZyTC2cNOeTCgDA3Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1730155403; a=rsa-sha256; cv=none; b=MCE6wUd+81BGjRlhkdkHRw/i+LFpn+WAh7QrT/NTkn3xF5SMtFlRbkNSHH05hy/H3e0Cco RPndAM0mdFTtf1oOBUSrxfv4/o/l/id7KJvABjuLCwikCakkWVbNHPXlKiqOH0mu60gvHP RMWUcOS5XGAjTV9rqqP2Wb3oFaqwunQFGo7nwXtMRx13wp0RC4kzWpU6s0L1o5IECzt/Ol CxbcYCxYDD0LJWoDlyg5m7kq+jqaAZMkHJei3+eeSlZ2NdfzGhhr9Oo1manOWtWbIpFNm1 cn3bRmZqjdDJ9m7p9qWT3erVwHrCWsyGp++2rgG8w+XRbUW371z6nNFq6qlpPQ== 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 4XcpMH247mzyFC; Mon, 28 Oct 2024 22:43:23 +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 49SMhNBN085321; Mon, 28 Oct 2024 22:43:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49SMhN8W085318; Mon, 28 Oct 2024 22:43:23 GMT (envelope-from git) Date: Mon, 28 Oct 2024 22:43:23 GMT Message-Id: <202410282243.49SMhN8W085318@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 73979b7f0bac - main - camcontrol: Bump timeout to get size of drive 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73979b7f0bac44a9b647c872ade17f4f7021a5e4 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=73979b7f0bac44a9b647c872ade17f4f7021a5e4 commit 73979b7f0bac44a9b647c872ade17f4f7021a5e4 Author: Warner Losh AuthorDate: 2024-10-28 22:33:07 +0000 Commit: Warner Losh CommitDate: 2024-10-28 22:43:25 +0000 camcontrol: Bump timeout to get size of drive When the system is very busy, and the ATA hard disk drives are overloaded due to reading dodgy sectors, it can take several seconds to drain the NCQ set of commands to send this command to the drive. Up the timeout from 5s to 10s out of an abundance of caution, but also to allow monitioring software that uses camcontrol identify to not fail needlessly. Sponsored by: Netflix --- sbin/camcontrol/camcontrol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index b7ad7f7d4b25..a2e65055fcaa 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -2102,7 +2102,7 @@ ata_read_native_max(struct cam_device *device, int retry_count, /*sector_count*/0, /*data_ptr*/NULL, /*dxfer_len*/0, - timeout ? timeout : 5000, + timeout ? timeout : 10 * 1000, is48bit); if (error)