From patchwork Fri Aug 15 14:45:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 4727581 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id D76039F462 for ; Fri, 15 Aug 2014 14:45:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ED2AC201F5 for ; Fri, 15 Aug 2014 14:45:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D2675201FB for ; Fri, 15 Aug 2014 14:45:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751718AbaHOOpc (ORCPT ); Fri, 15 Aug 2014 10:45:32 -0400 Received: from mail-qa0-f42.google.com ([209.85.216.42]:61935 "EHLO mail-qa0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751196AbaHOOpb (ORCPT ); Fri, 15 Aug 2014 10:45:31 -0400 Received: by mail-qa0-f42.google.com with SMTP id j15so2147085qaq.15 for ; Fri, 15 Aug 2014 07:45:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references; bh=kLWJwhIvVTv++W2fmA0c+E6KUqooXglnZHLza0/+AEs=; b=EVnV8au9x9+BFxaLQL3Sajm+aGsR9dxaw7bVnI9MwmLpos1aUZzboqCoefMtViF7ed KJJ6FspgjHxTCj+sO7TxV8HvoXDbceAxrHh5hsX13Q67mUOL4RJhwyRgTy9ZD5io6atQ CtGMEPyXFjCdslhqiD2xpRlPE0/CJTmOZJGK7EK2WrbqNwfuLRVlTKtzK3B8Nn3zsl5y wCoL+oIUPo7jNobJf247ULWyQ+A7uhwcQOhLSKPQYvbuB9KoFo7S+55agEou6lKXHZcE Grp6Xt3Scn0ORPgjMjm4sTLGu8GT5oMjMlOy+9whMCfdnrXB4jbUqcYG+gjNVifYw1Wm wrTQ== X-Gm-Message-State: ALoCoQnO1PUDC24jx8pQsESYzL8KkJyKzx3sFHFmIE406b0CqLOLSp9j+/E4FurMg6/gN4ksEFWl X-Received: by 10.140.94.100 with SMTP id f91mr26727084qge.41.1408113930605; Fri, 15 Aug 2014 07:45:30 -0700 (PDT) Received: from tlielax.poochiereds.net ([2001:470:8:d63:3a60:77ff:fe93:a95d]) by mx.google.com with ESMTPSA id t107sm3989900qgt.28.2014.08.15.07.45.29 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Aug 2014 07:45:29 -0700 (PDT) From: Jeff Layton To: linux-nfs@vger.kernel.org Subject: [nfs-utils RFC PATCH 6/7] nfsdcltrack: grab the client minorversion from the env var if it's present Date: Fri, 15 Aug 2014 10:45:14 -0400 Message-Id: <1408113915-5573-7-git-send-email-jlayton@primarydata.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1408113915-5573-1-git-send-email-jlayton@primarydata.com> References: <1408113915-5573-1-git-send-email-jlayton@primarydata.com> Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP And set the reclaim_complete field in the DB based on whether it's zero or not. We have no way to know for certain when a v4.0 client has completed reclaim, so we always set that field in the DB to zero for v4.0 clients. Signed-off-by: Jeff Layton --- utils/nfsdcltrack/nfsdcltrack.c | 29 +++++++++++++++++++++++++++-- utils/nfsdcltrack/sqlite.c | 16 ++++++++++++---- utils/nfsdcltrack/sqlite.h | 3 ++- 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/utils/nfsdcltrack/nfsdcltrack.c b/utils/nfsdcltrack/nfsdcltrack.c index f2813610be73..cbc98c7edc11 100644 --- a/utils/nfsdcltrack/nfsdcltrack.c +++ b/utils/nfsdcltrack/nfsdcltrack.c @@ -37,6 +37,7 @@ #include #include #include +#include #ifdef HAVE_SYS_CAPABILITY_H #include #include @@ -254,6 +255,30 @@ cltrack_init(const char __attribute__((unused)) *unused) return ret; } +/* + * Fetch the contents of the NFSDCLTRACK_CLIENT_MINORVERSION env var. If + * it's not set or there is an error converting it to an unsigned int + * then return 0 (since the minorversion isn't reliable at that point). + */ +static unsigned int +cltrack_get_minorvers(void) +{ + unsigned long minorvers; + char *end; + char *minorvers_str = getenv("NFSDCLTRACK_CLIENT_MINORVERSION"); + + if (!minorvers_str) + return 0; + + errno = 0; + minorvers = strtoul(minorvers_str, &end, 0); + /* Problem converting or value is too large? */ + if (errno || minorvers > UINT_MAX) + return 0; + + return (unsigned int)minorvers; +} + static int cltrack_create(const char *id) { @@ -270,7 +295,7 @@ cltrack_create(const char *id) if (len < 0) return (int)len; - ret = sqlite_insert_client(blob, len); + ret = sqlite_insert_client(blob, len, cltrack_get_minorvers()); return ret ? -EREMOTEIO : ret; } @@ -323,7 +348,7 @@ cltrack_check_legacy(const unsigned char *blob, const ssize_t len) } /* Dir exists, try to insert record into db */ - ret = sqlite_insert_client(blob, len); + ret = sqlite_insert_client(blob, len, 0); if (ret) { xlog(D_GENERAL, "Failed to insert client: %d", ret); return -EREMOTEIO; diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c index e260e81b1722..01084bb6c4d8 100644 --- a/utils/nfsdcltrack/sqlite.c +++ b/utils/nfsdcltrack/sqlite.c @@ -369,14 +369,22 @@ out_close: * Returns a non-zero sqlite error code, or SQLITE_OK (aka 0) */ int -sqlite_insert_client(const unsigned char *clname, const size_t namelen) +sqlite_insert_client(const unsigned char *clname, const size_t namelen, + const unsigned int minorvers) { int ret; sqlite3_stmt *stmt = NULL; - ret = sqlite3_prepare_v2(dbh, "INSERT OR REPLACE INTO clients VALUES " - "(?, strftime('%s', 'now'), 0);", -1, - &stmt, NULL); + if (minorvers == 0) + ret = sqlite3_prepare_v2(dbh, "INSERT OR REPLACE INTO clients " + "VALUES (?, strftime('%s', 'now'), 0);", -1, + &stmt, NULL); + else + ret = sqlite3_prepare_v2(dbh, "INSERT OR REPLACE INTO clients " + "VALUES (?, strftime('%s', 'now'), " + "strftime('%s', 'now'));", -1, + &stmt, NULL); + if (ret != SQLITE_OK) { xlog(L_ERROR, "%s: insert statement prepare failed: %s", __func__, sqlite3_errmsg(dbh)); diff --git a/utils/nfsdcltrack/sqlite.h b/utils/nfsdcltrack/sqlite.h index 3713bfb66e2f..e9cc84cbb294 100644 --- a/utils/nfsdcltrack/sqlite.h +++ b/utils/nfsdcltrack/sqlite.h @@ -21,7 +21,8 @@ #define _SQLITE_H_ int sqlite_prepare_dbh(const char *topdir); -int sqlite_insert_client(const unsigned char *clname, const size_t namelen); +int sqlite_insert_client(const unsigned char *clname, const size_t namelen, + const unsigned int minorvers); int sqlite_remove_client(const unsigned char *clname, const size_t namelen); int sqlite_check_client(const unsigned char *clname, const size_t namelen); int sqlite_remove_unreclaimed(const time_t grace_start);