evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

limit retries on WRITE/COMMIT verifier mismatch

Browse source 
Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2011-10-07 10:31:24 -04:00 • committed by unknown
parent f435606a16
commit 5dd3ef1e8c
1 changed files with 19 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

23
daemon/readwrite.c
View file

@ -34,6 +34,10 @@
#include "util.h" #include "util.h"
/* number of times to retry on write/commit verifier mismatch */
#define MAX_WRITE_RETRIES 6
const stateid4 special_read_stateid = {0xffffffff, const stateid4 special_read_stateid = {0xffffffff,
{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}}; {0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff}};
@ -184,6 +188,8 @@ static int write_to_mds(
const uint32_t maxwritesize = max_write_size(session, &file->fh); const uint32_t maxwritesize = max_write_size(session, &file->fh);
uint32_t to_send, reloffset, len; uint32_t to_send, reloffset, len;
int status = 0; int status = 0;
/* on write verifier mismatch, retry N times before failing */
uint32_t retries = MAX_WRITE_RETRIES;
retry_write: retry_write:
p = args->buffer; p = args->buffer;
@ -212,8 +218,10 @@ retry_write:
status = 0; status = 0;
break; break;
} }
if (!verify_write(&verf, &committed)) if (!verify_write(&verf, &committed)) {
goto retry_write; if (retries--) goto retry_write;
goto out_verify_failed;
}
} }
if (committed == UNSTABLE4) { if (committed == UNSTABLE4) {
dprintf(1, "sending COMMIT for offset=%d and len=%d\n", args->offset, len); dprintf(1, "sending COMMIT for offset=%d and len=%d\n", args->offset, len);
@ -221,12 +229,19 @@ retry_write:
if (status) if (status)
goto out; goto out;
if (!verify_commit(&verf)) if (!verify_commit(&verf)) {
goto retry_write; if (retries--) goto retry_write;
goto out_verify_failed;
}
} }
out: out:
args->out_len = len; args->out_len = len;
return nfs_to_windows_error(status, ERROR_NET_WRITE_FAULT); return nfs_to_windows_error(status, ERROR_NET_WRITE_FAULT);
out_verify_failed:
len = 0;
status = NFS4ERR_IO;
goto out;
} }
static int write_to_pnfs( static int write_to_pnfs(