From nobody Tue Jan 11 16:22:30 2022 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 5AA881937735; Tue, 11 Jan 2022 16:22:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JYGF30b07z3Lrw; Tue, 11 Jan 2022 16:22:31 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 E9F5C1C362; Tue, 11 Jan 2022 16:22:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20BGMU2N051954; Tue, 11 Jan 2022 16:22:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20BGMUfp051953; Tue, 11 Jan 2022 16:22:30 GMT (envelope-from git) Date: Tue, 11 Jan 2022 16:22:30 GMT Message-Id: <202201111622.20BGMUfp051953@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 08a8d16cbb26 - main - mount_nfs: Add a "bgnow" NFS mount option 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org 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/main X-Git-Reftype: branch X-Git-Commit: 08a8d16cbb269d4c2be02eb67351c59d16f4ecb9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641918151; 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=i50nOOaxCugPWYZ67k+KAm2QYG26uRrtJKGTd+WxDTk=; b=o/BCW8TvyFyvuRe+w8tkrYE0T4Naqp8PwzIw+fPH87TPTqQjg2nq4MWLNQ9wlYbsvyzZfs ftteocTCFmaeGDHNS2UGy0Zatc0sa1ybgA8DvR5BtYjRmb3ipD40PRpGU0AWwA5QdjWhLG CICzFZBXhp3HCCXtsybMd9OdlScNDmahhslKhgWDLeZ3CKDTyTu9Ujug5S2SfqXqp0PLBG V1yRcjtik+TVBuQMrlhP/iNalVQRS+MFXH+9ZprwMTCVTtCNm7InPGyCw4G0qQghzA0kOD JVRud3vJEydJ3fFYS9BD+D2YldQHJ8Ny0fb1wseZ2gqbe6SZWPR0VqSZCve/yA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641918151; a=rsa-sha256; cv=none; b=sPcA9KbAGm2GWlSsbzgVEbffVCBMkLTwai32JLd5UQxTGz2VzFyiSHl36w5DhnXLlWHkSn 3TS7f27ElChczDxYz/vrtOi7sc+WeifPEix1Q9q4gyJYoQMjdOXJjCbBf4C4nYCJ9jcn/6 abg+AXgkUyClS434f9jIeTfs0zYSAmsM2r/YoDhB3MOjS3RY5mQlCyXWSGtRq6bhiNI8D5 /HCNAIV7QU7AP6t8KnSBr8+BDEAiV2Q4ORIo01TUlVvuRK74GlcP3qYZlzUatkKnzBQRLC 1xAemTrDZzNJQtQqsXhUHYb45lESWO9MXfW7Byyv8Hz0NZKHBOMnTzkvJMuY2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=08a8d16cbb269d4c2be02eb67351c59d16f4ecb9 commit 08a8d16cbb269d4c2be02eb67351c59d16f4ecb9 Author: Rick Macklem AuthorDate: 2022-01-11 16:20:01 +0000 Commit: Rick Macklem CommitDate: 2022-01-11 16:21:35 +0000 mount_nfs: Add a "bgnow" NFS mount option The "bg" option does not go background until the initial mount attempt fails, which can take 60+ seconds. This new "bgnow" option goes background immediately, avoiding the 60+ second delay, if the NFS server is not yet available. The man page update is a content change. Tested by: jwb Reviewed by: debdrup, emaste PR: 260764 MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D33733 --- sbin/mount_nfs/mount_nfs.8 | 14 +++++++++++++- sbin/mount_nfs/mount_nfs.c | 23 +++++++++++++++++++---- 2 files changed, 32 insertions(+), 5 deletions(-) diff --git a/sbin/mount_nfs/mount_nfs.8 b/sbin/mount_nfs/mount_nfs.8 index 648cb2128e90..5725b6eccf65 100644 --- a/sbin/mount_nfs/mount_nfs.8 +++ b/sbin/mount_nfs/mount_nfs.8 @@ -28,7 +28,7 @@ .\" @(#)mount_nfs.8 8.3 (Berkeley) 3/29/95 .\" $FreeBSD$ .\" -.Dd July 10, 2021 +.Dd January 11, 2022 .Dt MOUNT_NFS 8 .Os .Sh NAME @@ -129,6 +129,18 @@ trying the mount in the background. Useful for .Xr fstab 5 , where the file system mount is not critical to multiuser operation. +.It Cm bgnow +Like +.Cm bg , +fork off a child to keep trying the mount in the background, +but do not attempt to mount in the foreground first. +This eliminates a +60+ second timeout when the server is not responding. +Useful for speeding up the boot process of a client when the server is +likely to be unavailable. +This is often the case for interdependent servers +such as cross-mounted servers (each of two servers is an NFS client of +the other) and for cluster nodes that must boot before the file servers. .It Cm deadthresh Ns = Ns Aq Ar value Set the .Dq "dead server threshold" diff --git a/sbin/mount_nfs/mount_nfs.c b/sbin/mount_nfs/mount_nfs.c index e1eaf206e982..898a6dc9d724 100644 --- a/sbin/mount_nfs/mount_nfs.c +++ b/sbin/mount_nfs/mount_nfs.c @@ -103,10 +103,11 @@ struct nfhret { long fhsize; u_char nfh[NFS3_FHSIZE]; }; -#define BGRND 1 -#define ISBGRND 2 -#define OF_NOINET4 4 -#define OF_NOINET6 8 +#define BGRND 0x01 +#define ISBGRND 0x02 +#define OF_NOINET4 0x04 +#define OF_NOINET6 0x08 +#define BGRNDNOW 0x10 static int retrycnt = -1; static int opflags = 0; static int nfsproto = IPPROTO_TCP; @@ -242,6 +243,9 @@ main(int argc, char *argv[]) if (strcmp(opt, "bg") == 0) { opflags |= BGRND; pass_flag_to_nmount=0; + } else if (strcmp(opt, "bgnow") == 0) { + opflags |= BGRNDNOW; + pass_flag_to_nmount=0; } else if (strcmp(opt, "fg") == 0) { /* same as not specifying -o bg */ pass_flag_to_nmount=0; @@ -421,6 +425,9 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; + if ((opflags & (BGRND | BGRNDNOW)) == (BGRND | BGRNDNOW)) + errx(1, "Options bg and bgnow are mutually exclusive"); + if (argc != 2) { usage(); /* NOTREACHED */ @@ -649,6 +656,14 @@ getnfsargs(char *spec, struct iovec **iov, int *iovlen) } } + if ((opflags & (BGRNDNOW | ISBGRND)) == BGRNDNOW) { + warnx("Mount %s:%s, backgrounding", + hostp, spec); + opflags |= ISBGRND; + if (daemon(0, 0) != 0) + err(1, "daemon"); + } + ret = TRYRET_LOCALERR; for (;;) { /*