From owner-svn-src-all@FreeBSD.ORG Sun Aug 10 12:00:17 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5702647A; Sun, 10 Aug 2014 12:00:17 +0000 (UTC) Received: from esa-jnhn.mail.uoguelph.ca (esa-jnhn.mail.uoguelph.ca [131.104.91.44]) by mx1.freebsd.org (Postfix) with ESMTP id DFB342A65; Sun, 10 Aug 2014 12:00:16 +0000 (UTC) X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvgGAHdd51ODaFve/2dsb2JhbABag19OCQEDgnTKMIdIAYEbd4QDAQEEASMEUgUWDgYEAgINGQJZBhOIOggNrCuUYReBLI1sATMHgnmBUwWOZYZZiEiTJIN4IS+BRw X-IronPort-AV: E=Sophos;i="5.01,836,1400040000"; d="scan'208";a="146199922" Received: from muskoka.cs.uoguelph.ca (HELO zcs3.mail.uoguelph.ca) ([131.104.91.222]) by esa-jnhn.mail.uoguelph.ca with ESMTP; 10 Aug 2014 07:59:07 -0400 Received: from zcs3.mail.uoguelph.ca (localhost.localdomain [127.0.0.1]) by zcs3.mail.uoguelph.ca (Postfix) with ESMTP id D657BB3F19; Sun, 10 Aug 2014 07:59:06 -0400 (EDT) Date: Sun, 10 Aug 2014 07:59:06 -0400 (EDT) From: Rick Macklem To: Rick Macklem Message-ID: <796544262.9468281.1407671946855.JavaMail.root@uoguelph.ca> In-Reply-To: <53e6c73c.2b9a.73209a54@svn.freebsd.org> Subject: Re: svn commit: r269771 - head/sys/fs/nfsserver MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [172.17.91.209] X-Mailer: Zimbra 7.2.6_GA_2926 (ZimbraWebClient - FF3.0 (Win)/7.2.6_GA_2926) Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 10 Aug 2014 12:00:17 -0000 I wrote: > Author: rmacklem > Date: Sun Aug 10 01:13:32 2014 > New Revision: 269771 > URL: http://svnweb.freebsd.org/changeset/base/269771 > > Log: > Change the NFS server's printf related to hitting > the DRC cache's flood level so that it suggests > increasing vfs.nfsd.tcphighwater. > > Suggested by: h.schmalzbauer@omnilan.de > Oops, I intended to put an MFC of 1 week here. Sorry about that, rick > Modified: > head/sys/fs/nfsserver/nfs_nfsdsocket.c > > Modified: head/sys/fs/nfsserver/nfs_nfsdsocket.c > ============================================================================== > --- head/sys/fs/nfsserver/nfs_nfsdsocket.c Sun Aug 10 00:30:12 2014 > (r269770) > +++ head/sys/fs/nfsserver/nfs_nfsdsocket.c Sun Aug 10 01:13:32 2014 > (r269771) > @@ -749,10 +749,9 @@ nfsrvd_compound(struct nfsrv_descript *n > nd->nd_rp->rc_refcnt == 0) && > (nfsrv_mallocmget_limit() || > nfsrc_tcpsavedreplies > nfsrc_floodlevel)) { > - if (nfsrc_tcpsavedreplies > nfsrc_floodlevel) { > - printf("nfsd server cache flooded, try to"); > - printf(" increase nfsrc_floodlevel\n"); > - } > + if (nfsrc_tcpsavedreplies > nfsrc_floodlevel) > + printf("nfsd server cache flooded, try " > + "increasing vfs.nfsd.tcphighwater\n"); > nd->nd_repstat = NFSERR_RESOURCE; > *repp = nfsd_errmap(nd); > if (op == NFSV4OP_SETATTR) { > >