From: andros@netapp.com
To: trond.myklebust@netapp.com
Cc: linux-nfs@vger.kernel.org, Andy Adamson <andros@netapp.com>
Subject: [PATCH Version 2 08/12] NFSv4.1 wake up all tasks on un-connected DS slot table waitq
Date: Wed, 21 Mar 2012 15:46:20 -0400 [thread overview]
Message-ID: <1332359184-1887-9-git-send-email-andros@netapp.com> (raw)
In-Reply-To: <1332359184-1887-1-git-send-email-andros@netapp.com>
From: Andy Adamson <andros@netapp.com>
The DS has a connection error (invalid deviceid). Drain the fore channel
slot table waitq.
Signed-off-by: Andy Adamson <andros@netapp.com>
---
fs/nfs/nfs4filelayout.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/fs/nfs/nfs4filelayout.c b/fs/nfs/nfs4filelayout.c
index b73818f..ccbafdd 100644
--- a/fs/nfs/nfs4filelayout.c
+++ b/fs/nfs/nfs4filelayout.c
@@ -193,6 +193,7 @@ static int filelayout_read_done_cb(struct rpc_task *task,
struct nfs_read_data *data)
{
struct nfs4_deviceid_node *devid = FILELAYOUT_DEVID_NODE(data->lseg);
+ struct nfs4_slot_table *tbl = &data->ds_clp->cl_session->fc_slot_table;
unsigned long reset = 0;
dprintk("%s DS read\n", __func__);
@@ -205,8 +206,10 @@ static int filelayout_read_done_cb(struct rpc_task *task,
if (test_bit(NFS4_RESET_TO_MDS, &reset)) {
filelayout_reset_read(task, data);
- if (test_bit(NFS4_RESET_DEVICEID, &reset))
+ if (test_bit(NFS4_RESET_DEVICEID, &reset)) {
filelayout_mark_devid_invalid(devid);
+ rpc_wake_up(&tbl->slot_tbl_waitq);
+ }
}
rpc_restart_call_prepare(task);
return -EAGAIN;
@@ -286,6 +289,7 @@ static int filelayout_write_done_cb(struct rpc_task *task,
struct nfs_write_data *data)
{
struct nfs4_deviceid_node *devid = FILELAYOUT_DEVID_NODE(data->lseg);
+ struct nfs4_slot_table *tbl = &data->ds_clp->cl_session->fc_slot_table;
unsigned long reset = 0;
if (filelayout_async_handle_error(task, data->args.context->state,
@@ -296,8 +300,10 @@ static int filelayout_write_done_cb(struct rpc_task *task,
if (test_bit(NFS4_RESET_TO_MDS, &reset)) {
filelayout_reset_write(task, data);
- if (test_bit(NFS4_RESET_DEVICEID, &reset))
+ if (test_bit(NFS4_RESET_DEVICEID, &reset)) {
filelayout_mark_devid_invalid(devid);
+ rpc_wake_up(&tbl->slot_tbl_waitq);
+ }
}
rpc_restart_call_prepare(task);
return -EAGAIN;
@@ -322,6 +328,7 @@ static int filelayout_commit_done_cb(struct rpc_task *task,
struct nfs_write_data *data)
{
struct nfs4_deviceid_node *devid = FILELAYOUT_DEVID_NODE(data->lseg);
+ struct nfs4_slot_table *tbl = &data->ds_clp->cl_session->fc_slot_table;
unsigned long reset = 0;
if (filelayout_async_handle_error(task, data->args.context->state,
@@ -332,8 +339,10 @@ static int filelayout_commit_done_cb(struct rpc_task *task,
if (test_bit(NFS4_RESET_TO_MDS, &reset)) {
prepare_to_resend_writes(data);
- if (test_bit(NFS4_RESET_DEVICEID, &reset))
+ if (test_bit(NFS4_RESET_DEVICEID, &reset)) {
filelayout_mark_devid_invalid(devid);
+ rpc_wake_up(&tbl->slot_tbl_waitq);
+ }
} else {
rpc_restart_call_prepare(task);
}
--
1.7.6.4
next prev parent reply other threads:[~2012-03-21 19:46 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-21 19:46 [PATCH Version 2 00/12] NFSv4.1 file layout data server quick failover andros
2012-03-21 19:46 ` [PATCH Version 2 01/12] NFSv4.1 move nfs4_reset_read and nfs_reset_write andros
2012-03-21 19:46 ` [PATCH Version 2 02/12] NFSv4.1: cleanup filelayout invalid deviceid handling andros
2012-03-21 19:46 ` [PATCH Version 2 03/12] NFSv4.1 cleanup filelayout invalid layout handling andros
2012-03-21 19:46 ` [PATCH Version 2 04/12] NFSv4.1 set RPC_TASK_SOFTCONN for filelayout DS RPC calls andros
2012-03-21 19:46 ` [PATCH Version 2 05/12] NFSv4.1: mark deviceid invalid on filelayout DS connection errors andros
2012-03-21 20:39 ` Myklebust, Trond
2012-03-22 13:23 ` Adamson, Andy
2012-03-22 13:44 ` Myklebust, Trond
2012-03-22 13:53 ` Andy Adamson
2012-03-21 19:46 ` [PATCH Version 2 06/12] NFSv4.1: send filelayout DS commits to the MDS on invalid deviceid andros
2012-03-21 19:46 ` [PATCH Version 2 07/12] NFSv4.1 Check invalid deviceid upon slot table waitq wakeup andros
2012-03-21 19:46 ` andros [this message]
2012-03-21 19:46 ` [PATCH Version 2 09/12] NFSv4.1 ref count nfs_client across filelayout data server io andros
2012-03-21 19:46 ` [PATCH Version 2 10/12] NFSv4.1 de reference a disconnected data server client record andros
2012-03-21 19:46 ` [PATCH Version 2 11/12] NFSv4.1 check for NULL pnfs_layout_hdr in pnfs scan commit lists andros
2012-03-21 19:46 ` [PATCH Version 2 12/12] NFSv4.1 have filelayout_initiate_commit return void andros
2012-03-21 20:47 ` Myklebust, Trond
2012-03-25 14:59 ` Fred Isaman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1332359184-1887-9-git-send-email-andros@netapp.com \
--to=andros@netapp.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@netapp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox