From nobody Fri Jun 26 01:37:04 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 4gmdZZ43fCz6jk4D for ; Fri, 26 Jun 2026 01:37:10 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gmdZZ1fbzz45gs for ; Fri, 26 Jun 2026 01:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782437830; 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=X+Bj8sRq/VGeZrWZ9plkScJKxfm67YWnjl8JM/xeK38=; b=JcF8ULokdVXNZTiC8dWQieVb/3cDWGxrMBYJfcRtv//oN3NPeF9TaIrSRaZzhLmloz21h1 irmJMBI0l2RqOO0H9lpZ3JKNe1t00dzYIXCElWgD55R1Jz0L292I+cmARFq/CKdzfzcbGP JWWY5iApBf8NyGLQ8LfDAC5fO7HastywfGOeMNvsvx0P1dlD5JeboPUmZrvMjcrqYCgif9 +1c0F0qjJLzjHhbGIHN4YdbxWm2v3XM5i8+cTO8WqVVc29KgGkKZ33ga+8UfgVooW3buSW HgnyCg2rNgZd1vz0a+VrorWnvQusD+lv3xwFDrvneHMu+J72Q7/ZZ7CoxOl0kA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782437830; a=rsa-sha256; cv=none; b=lBWMjVrGwy9kaOukFuuwExGGSlJA2jp7RBUn/NtkJEQhh3OZkQsnSZSgHn+DnJ5Pk7zXxY sbbOx6vFgTnui3SDQ1+zuisWgONWmuNrjaK+mceoVIVkYqd43WgOwa840f4/hSjweNVbGm Y8HT01yL8/9+qi0K8309TQyOSVvaPl2P4lQoKrLoSk2j45wnluL719TavmEfDR8yXCBIYj OWCvfxStgxJOiZJ0rgXBmRzBoXAG3Bz76HkYgYDumymZlvnkh1u62t/C2woOZuBwOXxvk3 jYwPmF064jxONupc1i6NlYOwnnlt0Sf3B4Dh4P+FEPWZ6Z/suIbjsf5uZv1mRg== 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=1782437830; 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=X+Bj8sRq/VGeZrWZ9plkScJKxfm67YWnjl8JM/xeK38=; b=rIurgRf/u4M9ZsiwuH2284Onw3SjnWatRok/Uatwq/q3wO7lao3Jv4sQ+WzZGhHJfDVplz frbXFrvmuQ0n8UkpmtprCjKR6qSUsDerRj2+a2E50IDXOm70OVViQPuUfsgblckuwkdnyQ e4z8L2rDPVShG3/18/JpkuJnkVkticmV2DC96/8Zb5QIN1cbCcSD4fMiyKiAedFDrWSq0k lhkL+rsJ+sp9paFuUt8RryrLI0GwAYWfNyqdDDa8Kgq0hLLiDEhtKMMQSr3aJQLubHHejJ 5ad9GgYyRbg4AhACduXytBInsoOVl4nkuh/8kldlCzI+Q8nSrUY8+wqII8Gtpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmdZZ0G7Qz1Mv for ; Fri, 26 Jun 2026 01:37:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42dd6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 01:37:04 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: afc113696ff6 - stable/14 - nfs_commonkrpc.c: Improve handling of NFSv4.1/4.2 recovery 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: afc113696ff6652f132e2893e8efacb669860667 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 01:37:04 +0000 Message-Id: <6a3dd7c0.42dd6.1adbb277@gitrepo.freebsd.org> The branch stable/14 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=afc113696ff6652f132e2893e8efacb669860667 commit afc113696ff6652f132e2893e8efacb669860667 Author: Rick Macklem AuthorDate: 2026-06-04 22:02:48 +0000 Commit: Rick Macklem CommitDate: 2026-06-26 01:35:27 +0000 nfs_commonkrpc.c: Improve handling of NFSv4.1/4.2 recovery Commit 4d80d4913e79 fixed a long standing bug in the recovery code. However. glebius@ reported seeing multiple recovery cycles with this patch during an NFSv4.1/4.2 server reboot. This commit should minimize the risk of multiple recovery cycles. PR: 294925 (cherry picked from commit ea4886f2829bf33866c8c0c60b14a9641fc54b40) --- sys/fs/nfs/nfs_commonkrpc.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/fs/nfs/nfs_commonkrpc.c b/sys/fs/nfs/nfs_commonkrpc.c index c7ac2553d1f4..7a256366de2e 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1250,17 +1250,20 @@ tryagain: if (bcmp(sep->nfsess_sessionid, nd->nd_sessionid, NFSX_V4SESSIONID) == 0 && sep->nfsess_defunct == 0) { - printf("Initiate recovery. If server " - "has not rebooted, " - "check NFS clients for unique " - "/etc/hostid's\n"); /* Initiate recovery. */ sep->nfsess_defunct = 1; NFSCL_DEBUG(1, "Marked defunct\n"); - if (nmp->nm_clp != NULL) { + if (nmp->nm_clp != NULL && + (nmp->nm_clp->nfsc_flags & + (NFSCLFLAGS_RECVRINPROG | + NFSCLFLAGS_RECOVER)) == 0) { nmp->nm_clp->nfsc_flags |= NFSCLFLAGS_RECOVER; wakeup(nmp->nm_clp); + printf("Initiate recovery. If " + "server has not rebooted, " + "check NFS clients for " + "unique /etc/hostid's\n"); } } NFSUNLOCKCLSTATE();