From nobody Fri Jun 26 01:41:01 2026 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 4gmdg24T0bz6jk9K for ; Fri, 26 Jun 2026 01:41:02 +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 4gmdg20X62z45ly for ; Fri, 26 Jun 2026 01:41:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782438062; 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=OrmzC4L85kKOPKS91e63BySwc9xlNbJjtUOFyqCo6HM=; b=wJjyhNNYVX0LdQKQGNB6g8dg6qoDqb4sj1/dFW2HWCo2391trAp8cQP77plS7XlI1PlkGv H7yercAfLqSJ5ifS5TGJ2nrxJW5bSqHbzM4HwCSejLyuqRmm8/vQaWqknmM2Q5dvfddwoA iIP173g13ZTs1F31R5PSizO4i/mLGuxoHZUJ5kdnzj7D4y4Qc83oGt7zPMA2OLCiIHpB3d P4p1yPKCrNwj5O1KVpRa2j99xDbLS7uQyHj+po2yBUc8hKDjH5IGMfWwytIQn408rC1Nft YgvWLKMpeYTZGgPBW4SHlY+4MIAbDO0R2Gx0/LLpSyDu1YnXkEo1MusmGIU1nQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782438062; a=rsa-sha256; cv=none; b=kTRIaFtToIY0zF8qRRaty8fKKcRZe3JsqHE9u3LOfiPC8AFjS5kbzN3jp58q+HTz9ovyKW 98txjscEgTMhFazl7ucKB7EsJGjyV6SH1enPS7iCTliNmWYJIHhoPDCIibvnMsm5mvhoaT PQ0k1gOzhG5tOSifjfUQfQkj1fMrgti8yDCdF7agmwlgzTWNTn0wkB/m49HRjBKz5oO4FI XN3XpZ1irdSE9+GfjOLBMxwX5ywLyCmuHqGLvg2qeBWt3zpkBvFvU9TNGtYo3DAnL2/cnj MULyRs4UonuRBI7mptPh4PT9Ap0cE3ibj+dVvnRKcT6YyVjx6nenGN8IP4oLOw== 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=1782438062; 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=OrmzC4L85kKOPKS91e63BySwc9xlNbJjtUOFyqCo6HM=; b=nOU7OsZxE15n9/tup/0C5+x3b4UbnNMCHClfTEUab+W0Mi5ChhqiHugq4dbupGp7RH45oM NAq9jLrJp5F2o+0uNWkAmJMICnVk1Lg9zGcfBvHioQFlnv0EMwI0UNqyJlmeDfRh6W7e7q hlBW7D1o+r2JZbQ8mQRSFj6VOSM8/fEY/CCCWQ5mxrYrt0Y8hXD2x5VZUhJEzG27Qe7/YM he14La5b/y6PoIlr11Hptc1i8ZNW7E+lzwnUGYhxXClPuSHxPQPor+ZcGjWJYRAHZyi81j O4Oxdrxi4cvU1NTH3h1JHpm+TitrvwjiSawMD64ZAiW97z7R0FDOJj5SgRpyVA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gmdg16CNcz1c3 for ; Fri, 26 Jun 2026 01:41:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42dfb by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 01:41:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Rick Macklem Subject: git: ae9f66486df6 - stable/15 - nfs_commonkrpc.c: Improve handling of NFSv4.1/4.2 recovery 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 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/15 X-Git-Reftype: branch X-Git-Commit: ae9f66486df64edcd0f2bef70afa67d245916835 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 01:41:01 +0000 Message-Id: <6a3dd8ad.42dfb.45e0e057@gitrepo.freebsd.org> The branch stable/15 has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=ae9f66486df64edcd0f2bef70afa67d245916835 commit ae9f66486df64edcd0f2bef70afa67d245916835 Author: Rick Macklem AuthorDate: 2026-06-04 22:02:48 +0000 Commit: Rick Macklem CommitDate: 2026-06-26 01:39:35 +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 2d4c41994c0e..f30ae7cbffa2 100644 --- a/sys/fs/nfs/nfs_commonkrpc.c +++ b/sys/fs/nfs/nfs_commonkrpc.c @@ -1268,17 +1268,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();