From patchwork Tue Jan 4 22:24:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "J. Bruce Fields" X-Patchwork-Id: 12703894 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16225C433F5 for ; Tue, 4 Jan 2022 22:24:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235396AbiADWYq (ORCPT ); Tue, 4 Jan 2022 17:24:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234157AbiADWYq (ORCPT ); Tue, 4 Jan 2022 17:24:46 -0500 Received: from fieldses.org (fieldses.org [IPv6:2600:3c00:e000:2f7::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E85E1C061761 for ; Tue, 4 Jan 2022 14:24:45 -0800 (PST) Received: by fieldses.org (Postfix, from userid 2815) id 2A12872F7; Tue, 4 Jan 2022 17:24:45 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.11.0 fieldses.org 2A12872F7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fieldses.org; s=default; t=1641335085; bh=gnlPJfVq0juSsFwdAVk5gsjcd5RsGD159xB2VHLYKLE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=EQy9NJoLl1L/otkRtkiI2dn7arlIAavefelZY3z1mPGq25m18wW0XPwVEZGzCd+O/ Bw0ACngkbUDwrdQgHPYd9qjMQ2YlXNBq1Bgjt8qFoHCRmpX0sNO7iUi+0Jey2u4RSo y0oVyy+3XmZkIblp5knNYNR8J13DKwmr01E1l0k8= Date: Tue, 4 Jan 2022 17:24:45 -0500 From: Bruce Fields To: Steve Dickson Cc: Chuck Lever III , Dai Ngo , Linux NFS Mailing List Subject: [PATCH] nfsdcld: use WAL journal for faster commits Message-ID: <20220104222445.GF12040@fieldses.org> References: <20211201174205.GB26415@fieldses.org> <20211201180339.GC26415@fieldses.org> <20211201195050.GE26415@fieldses.org> <20211203212200.GB3930@fieldses.org> <20211203215531.GC3930@fieldses.org> <469DF1ED-C2AB-43CE-AB70-BFD2AFC2A68D@oracle.com> <20211203223921.GA6151@fieldses.org> <915221EC-387C-4F50-83C6-8DCF02DD2A5D@oracle.com> <20211204012402.GA7805@fieldses.org> <57EA2D75-823E-4164-9000-E7C7C970C60B@oracle.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <57EA2D75-823E-4164-9000-E7C7C970C60B@oracle.com> User-Agent: Mutt/1.5.21 (2010-09-15) Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: "J. Bruce Fields" Currently nfsdcld is doing three fdatasyncs for each upcall. Based on SQLite documentation, WAL mode should also be safe, and I can confirm from an strace that it results in only one fdatasync each. This may be a bottleneck e.g. when lots of clients are being created or expired at once (e.g. on reboot). Not bothering with error checking, as this is just an optimization and nfsdcld will still function without. (Might be better to log something on failure, though.) Reviewed-by: Chuck Lever Signed-off-by: J. Bruce Fields --- aclocal/libsqlite3.m4 | 2 +- utils/nfsdcld/sqlite.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) Resending to make sure SteveD saw this....--b. diff --git a/aclocal/libsqlite3.m4 b/aclocal/libsqlite3.m4 index 8c38993cbba8..c3beb4d56f0c 100644 --- a/aclocal/libsqlite3.m4 +++ b/aclocal/libsqlite3.m4 @@ -22,7 +22,7 @@ AC_DEFUN([AC_SQLITE3_VERS], [ int vers = sqlite3_libversion_number(); return vers != SQLITE_VERSION_NUMBER || - vers < 3003000; + vers < 3007000; } ], [libsqlite3_cv_is_recent=yes], [libsqlite3_cv_is_recent=no], [libsqlite3_cv_is_recent=unknown]) diff --git a/utils/nfsdcld/sqlite.c b/utils/nfsdcld/sqlite.c index 03016fb95823..eabb0daa95f5 100644 --- a/utils/nfsdcld/sqlite.c +++ b/utils/nfsdcld/sqlite.c @@ -826,6 +826,8 @@ sqlite_prepare_dbh(const char *topdir) goto out_close; } + sqlite3_exec(dbh, "PRAGMA journal_mode = WAL;", NULL, NULL, NULL); + ret = sqlite_query_schema_version(); switch (ret) { case CLD_SQLITE_LATEST_SCHEMA_VERSION: