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

check write verifiers on COMMIT

Browse source 
we were previously only verifying that the server didn't reboot between WRITEs.  COMMIT returns a verifier that needs to be checked as well

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2011-09-14 11:49:34 -04:00 • committed by unknown
parent d646e5c58c
commit f435606a16
8 changed files with 49 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

23
daemon/pnfs_io.c
View file

@ -421,14 +421,20 @@ retry_write:
dprintf(1, "sending COMMIT to data server for offset=%lld len=%lld\n",
commit_min, commit_max - commit_min);
nfsstat = nfs41_commit(client->session, commit_file,
commit_min, (uint32_t)(commit_max - commit_min), 0);
commit_min, (uint32_t)(commit_max - commit_min), 0, &verf);
/* on successful commit, leave pnfs_status unchanged; if the layout
* was recalled, we still want to return the error */
if (nfsstat == NFS4_OK)
thread->stable = DATA_SYNC4;
else
if (nfsstat)
status = map_ds_error(nfsstat, pattern->state);
else if (!verify_commit(&verf)) {
/* resend the writes unless the layout was recalled */
if (status != PNFSERR_LAYOUT_RECALLED)
goto retry_write;
status = PNFSERR_IO;
} else {
/* on successful commit, leave pnfs_status unchanged; if the
* layout was recalled, we still want to return the error */
thread->stable = DATA_SYNC4;
}
out:
dprintf(IOLVL, "<-- file_layout_write_thread(%u) returning %s\n",
thread->id, pnfs_error_string(status));
@ -550,10 +556,13 @@ enum pnfs_status pnfs_write(
goto out_free_pattern;
if (stable == UNSTABLE4) {
nfs41_write_verf ignored;
/* not all data was committed, so commit to metadata server */
dprintf(1, "sending COMMIT to meta server for offset=%lld len=%lld\n",
offset, *len_out);
nfsstat = nfs41_commit(state->session, &state->file, offset, *len_out, 1);
nfsstat = nfs41_commit(state->session, &state->file,
offset, *len_out, 1, &ignored);
if (nfsstat) {
dprintf(IOLVL, "nfs41_commit() failed with %s\n",
nfs_error_string(nfsstat));