From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: linux-nfs-owner@vger.kernel.org Received: from mx1.redhat.com ([209.132.183.28]:29058 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756260Ab1LOSoE (ORCPT ); Thu, 15 Dec 2011 13:44:04 -0500 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id pBFIi4aD032282 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 15 Dec 2011 13:44:04 -0500 Received: from dantu.rdu.redhat.com (dantu.rdu.redhat.com [10.11.228.66]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id pBFIi17j010403 for ; Thu, 15 Dec 2011 13:44:04 -0500 From: Jeff Layton To: linux-nfs@vger.kernel.org Subject: [PATCH v2 7/7] nfsdcld: add function to remove unreclaimed client records Date: Thu, 15 Dec 2011 13:44:01 -0500 Message-Id: <1323974641-16515-8-git-send-email-jlayton@redhat.com> In-Reply-To: <1323974641-16515-1-git-send-email-jlayton@redhat.com> References: <1323974641-16515-1-git-send-email-jlayton@redhat.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: This should remove any client record that has a timestamp prior to the given time. Eventually, this call will need to be made cluster aware when this is run in a clustered configuration. For now, this is only suitable for single-host configurations. Signed-off-by: Jeff Layton --- utils/nfsdcld/nfsdcld.c | 30 +++++++++++++++++++++++++++++- utils/nfsdcld/sqlite.c | 28 ++++++++++++++++++++++++++++ utils/nfsdcld/sqlite.h | 1 + 3 files changed, 58 insertions(+), 1 deletions(-) diff --git a/utils/nfsdcld/nfsdcld.c b/utils/nfsdcld/nfsdcld.c index 2322ab7..6fabbe7 100644 --- a/utils/nfsdcld/nfsdcld.c +++ b/utils/nfsdcld/nfsdcld.c @@ -187,6 +187,32 @@ cld_check(struct cld_client *clnt) } static void +cld_gracedone(struct cld_client *clnt) +{ + int ret; + ssize_t bsize, wsize; + struct cld_msg *cmsg = &clnt->cl_msg; + + xlog(D_GENERAL, "%s: grace done. cm_gracetime=%ld", __func__, + cmsg->cm_u.cm_gracetime); + + ret = sqlite_remove_unreclaimed(cmsg->cm_u.cm_gracetime); + + /* set up reply: downcall with 0 status */ + cmsg->cm_status = ret ? -EREMOTEIO : ret; + + bsize = sizeof(*cmsg); + + xlog(D_GENERAL, "Doing downcall with status %d", cmsg->cm_status); + wsize = atomicio((void *)write, clnt->cl_fd, cmsg, bsize); + if (wsize != bsize) { + xlog(L_ERROR, "%s: problem writing to cld pipe (%ld): %m", + __func__, wsize); + cld_pipe_reopen(clnt); + } +} + +static void cldcb(int UNUSED(fd), short which, void *data) { ssize_t len; @@ -213,8 +239,10 @@ cldcb(int UNUSED(fd), short which, void *data) case Cld_Allow: cld_check(clnt); break; - case Cld_NrToReclaim: case Cld_GraceDone: + cld_gracedone(clnt); + break; + case Cld_NrToReclaim: xlog_warn("%s: command %u is not yet implemented", __func__, cmsg->cm_cmd); break; diff --git a/utils/nfsdcld/sqlite.c b/utils/nfsdcld/sqlite.c index 63d5363..be1bb71 100644 --- a/utils/nfsdcld/sqlite.c +++ b/utils/nfsdcld/sqlite.c @@ -38,6 +38,7 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ +#include #include #include #include @@ -358,3 +359,30 @@ out_err: sqlite3_finalize(stmt); return ret; } + +/* + * remove any client records that were not reclaimed since grace_start. + */ +int +sqlite_remove_unreclaimed(time_t grace_start) +{ + int ret; + char *err = NULL; + + ret = snprintf(buf, sizeof(buf), "DELETE FROM clients WHERE time < %ld", + grace_start); + if (ret < 0) { + return ret; + } else if ((size_t)ret >= sizeof(buf)) { + ret = -EINVAL; + return ret; + } + + ret = sqlite3_exec(dbh, buf, NULL, NULL, &err); + if (ret != SQLITE_OK) + xlog(D_GENERAL, "Delete failed: %s", err); + + xlog(D_GENERAL, "%s: returning %d", __func__, ret); + sqlite3_free(err); + return ret; +} diff --git a/utils/nfsdcld/sqlite.h b/utils/nfsdcld/sqlite.h index 613ae97..b0f3f85 100644 --- a/utils/nfsdcld/sqlite.h +++ b/utils/nfsdcld/sqlite.h @@ -25,5 +25,6 @@ int sqlite_maindb_init(void); int sqlite_insert_client(const unsigned char *clname, const size_t namelen); 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); #endif /* _SQLITE_H */ -- 1.7.1