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

recovery: avoid recursive state recovery

Browse source 
avoid the recursive case where state recovery operations (OPEN for reclaim and RECLAIM_COMPLETE) return BADSESSION, which kicks off another round of recovery

added a 'bool_t try_recovery' argument to compound_encode_send_decode() in place of its unused 'bufsize_in' and 'bufsize_out'.  when try_recovery=FALSE, return BADSESSION/STALE_CLIENTID errors instead of attempting recovery.  nfs41_open_reclaim(), nfs41_reclaim_complete(), and nfs41_destroy_session() now pass try_recovery=FALSE

during state recovery, we can now check the return values of nfs41_open_reclaim() and nfs41_reclaim_complete() for BADSESSION, and use a goto to restart session recovery

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2010-11-18 11:23:49 -05:00 • committed by unknown
parent 80cb5b5f57
commit 7c8f58b992
5 changed files with 45 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

2
daemon/lookup.c
View file

@ -160,7 +160,7 @@ static int lookup_rpc(
} }
buffer_size = MAX_RPC_RES_SIZE(component_count); buffer_size = MAX_RPC_RES_SIZE(component_count);
status = compound_encode_send_decode(session, &compound, 0, buffer_size); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;

2
daemon/name_cache.c
View file

@ -1099,7 +1099,7 @@ static int rpc_array_putfh(
putfh_args[i].in_recovery = 1; putfh_args[i].in_recovery = 1;
} }
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) goto out; if (status) goto out;
status = sequence_res.sr_status; status = sequence_res.sr_status;

29
daemon/nfs41_compound.c
View file

@ -126,8 +126,7 @@ static void recovery_finish(
int compound_encode_send_decode( int compound_encode_send_decode(
nfs41_session *session, nfs41_session *session,
nfs41_compound *compound, nfs41_compound *compound,
uint32_t bufsize_in, bool_t try_recovery)
uint32_t bufsize_out)
{ {
int status, retry_count = 0, delayby = 0; int status, retry_count = 0, delayby = 0;
nfs41_sequence_args *args = nfs41_sequence_args *args =
@ -182,17 +181,14 @@ retry:
if (compound->res.status != NFS4_OK) if (compound->res.status != NFS4_OK)
dprintf(1, "\n################ %s ################\n\n", dprintf(1, "\n################ %s ################\n\n",
nfs_error_string(compound->res.status)); nfs_error_string(compound->res.status));
if (compound->res.status != NFS4_OK &&
compound->args.argarray[0].op == OP_DESTROY_SESSION) {
dprintf(1, "OP_DESTROY_SESSION ignoring errors\n");
compound->res.status = NFS4_OK;
}
switch (compound->res.status) { switch (compound->res.status) {
case NFS4_OK: case NFS4_OK:
break; break;
case NFS4ERR_STALE_CLIENTID: case NFS4ERR_STALE_CLIENTID:
if (!try_recovery)
goto out;
if (!recovery_start_or_wait(session->client)) if (!recovery_start_or_wait(session->client))
goto do_retry; goto do_retry;
//try to create a new client //try to create a new client
@ -207,9 +203,12 @@ retry:
//fallthru and reestablish the session //fallthru and reestablish the session
case NFS4ERR_BADSESSION: case NFS4ERR_BADSESSION:
if (compound->res.status == NFS4ERR_BADSESSION) { if (compound->res.status == NFS4ERR_BADSESSION) {
if (!try_recovery)
goto out;
if (!recovery_start_or_wait(session->client)) if (!recovery_start_or_wait(session->client))
goto do_retry; goto do_retry;
} }
restart_recovery:
//try to create a new session //try to create a new session
status = nfs41_session_renew(session); status = nfs41_session_renew(session);
if (status == NFS4ERR_STALE_CLIENTID) { if (status == NFS4ERR_STALE_CLIENTID) {
@ -221,15 +220,8 @@ retry:
recovery_finish(session->client); recovery_finish(session->client);
goto out; goto out;
} }
status = nfs41_session_renew(session); goto restart_recovery;
if (status) { } else if (status) {
eprintf("after reestablishing clientid: nfs41_session_renew() "
"failed with %d\n", status);
status = ERROR_BAD_NET_RESP;
recovery_finish(session->client);
goto out;
}
} else if (status && status != NFS4ERR_STALE_CLIENTID) {
eprintf("nfs41_session_renew: failed with %d\n", status); eprintf("nfs41_session_renew: failed with %d\n", status);
recovery_finish(session->client); recovery_finish(session->client);
goto out; goto out;
@ -252,6 +244,9 @@ retry:
AcquireSRWLockExclusive(&open->lock); AcquireSRWLockExclusive(&open->lock);
memcpy(&open->stateid, &stateid, sizeof(stateid4)); memcpy(&open->stateid, &stateid, sizeof(stateid4));
ReleaseSRWLockExclusive(&open->lock); ReleaseSRWLockExclusive(&open->lock);
} else if (status == NFS4ERR_BADSESSION) {
LeaveCriticalSection(&state->lock);
goto restart_recovery;
} }
} }
LeaveCriticalSection(&state->lock); LeaveCriticalSection(&state->lock);
@ -261,6 +256,8 @@ retry:
if (status && status == NFS4ERR_NOTSUPP) if (status && status == NFS4ERR_NOTSUPP)
eprintf("nfs41_reclaim_complete() failed with %s\n", eprintf("nfs41_reclaim_complete() failed with %s\n",
nfs_error_string(status)); nfs_error_string(status));
if (status == NFS4ERR_BADSESSION)
goto restart_recovery;
} }
recovery_finish(session->client); recovery_finish(session->client);
goto do_retry; goto do_retry;

3
daemon/nfs41_compound.h
View file

@ -77,7 +77,6 @@ void compound_add_op(
int compound_encode_send_decode( int compound_encode_send_decode(
nfs41_session *session, nfs41_session *session,
nfs41_compound *compound, nfs41_compound *compound,
uint32_t bufsize_in, bool_t try_recovery);
uint32_t bufsize_out);
#endif /* __NFS41_DAEMON_COMPOUND_H__ */ #endif /* __NFS41_DAEMON_COMPOUND_H__ */

56
daemon/nfs41_ops.c
View file

@ -246,7 +246,8 @@ int nfs41_destroy_session(
compound_add_op(&compound, OP_DESTROY_SESSION, &ds_args, &ds_res); compound_add_op(&compound, OP_DESTROY_SESSION, &ds_args, &ds_res);
ds_args.dsa_sessionid = session->session_id; ds_args.dsa_sessionid = session->session_id;
status = compound_encode_send_decode(session, &compound, 0, 0); /* don't attempt to recover from BADSESSION/STALE_CLIENTID */
status = compound_encode_send_decode(session, &compound, FALSE);
if (status) if (status)
goto out; goto out;
@ -278,7 +279,8 @@ enum nfsstat4 nfs41_reclaim_complete(
compound_add_op(&compound, OP_RECLAIM_COMPLETE, NULL, &reclaim_res); compound_add_op(&compound, OP_RECLAIM_COMPLETE, NULL, &reclaim_res);
status = compound_encode_send_decode(session, &compound, 0, 0); /* don't attempt to recover from BADSESSION */
status = compound_encode_send_decode(session, &compound, FALSE);
if (status) if (status)
goto out; goto out;
@ -365,7 +367,7 @@ int nfs41_open(
pgetattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT; pgetattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT;
pgetattr_res.info = &dir_info; pgetattr_res.info = &dir_info;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -468,7 +470,8 @@ int nfs41_open_reclaim(
pgetattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT; pgetattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT;
pgetattr_res.info = &dir_info; pgetattr_res.info = &dir_info;
status = compound_encode_send_decode(session, &compound, 0, 0); /* don't attempt to recover from BADSESSION errors */
status = compound_encode_send_decode(session, &compound, FALSE);
if (status) if (status)
goto out; goto out;
@ -559,7 +562,7 @@ int nfs41_create(
pgetattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT; pgetattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT;
pgetattr_res.info = &dir_info; pgetattr_res.info = &dir_info;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -629,7 +632,7 @@ int nfs41_close(
getattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT; getattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT;
getattr_res.info = &info; getattr_res.info = &info;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -702,7 +705,7 @@ int nfs41_write(
getattr_res.info = &info; getattr_res.info = &info;
} }
status = compound_encode_send_decode(session, &compound, data_len, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -769,7 +772,7 @@ int nfs41_read(
read_res.resok4.data_len = count; read_res.resok4.data_len = count;
read_res.resok4.data = data_out; read_res.resok4.data = data_out;
status = compound_encode_send_decode(session, &compound, 0, count); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -838,7 +841,7 @@ int nfs41_commit(
getattr_res.info = &info; getattr_res.info = &info;
} }
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -906,7 +909,7 @@ int nfs41_lock(
lock_res.u.resok4.lock_stateid = &stateid->stateid; lock_res.u.resok4.lock_stateid = &stateid->stateid;
lock_res.u.denied.owner.owner_len = NFS4_OPAQUE_LIMIT; lock_res.u.denied.owner.owner_len = NFS4_OPAQUE_LIMIT;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -952,7 +955,7 @@ int nfs41_unlock(
locku_args.lock_stateid = stateid; locku_args.lock_stateid = stateid;
locku_res.lock_stateid = &stateid->stateid; locku_res.lock_stateid = &stateid->stateid;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -1002,8 +1005,7 @@ int nfs41_readdir(
readdir_res.reply.entries = entries; readdir_res.reply.entries = entries;
ZeroMemory(entries, readdir_args.dircount); ZeroMemory(entries, readdir_args.dircount);
status = compound_encode_send_decode(session, &compound, status = compound_encode_send_decode(session, &compound, TRUE);
0, readdir_args.maxcount);
if (status) if (status)
goto out; goto out;
@ -1065,7 +1067,7 @@ int nfs41_getattr(
getattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT; getattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT;
getattr_res.info = info; getattr_res.info = info;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -1124,7 +1126,7 @@ int nfs41_remove(
getattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT; getattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT;
getattr_res.info = &info; getattr_res.info = &info;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -1206,7 +1208,7 @@ int nfs41_rename(
src_getattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT; src_getattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT;
src_getattr_res.info = &src_info; src_getattr_res.info = &src_info;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -1284,7 +1286,7 @@ int nfs41_setattr(
setattr_args.stateid = stateid; setattr_args.stateid = stateid;
setattr_args.info = info; setattr_args.info = info;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -1375,7 +1377,7 @@ int nfs41_link(
compound_add_op(&compound, OP_GETFH, NULL, &getfh_res); compound_add_op(&compound, OP_GETFH, NULL, &getfh_res);
getfh_res.fh = &link_out->fh; getfh_res.fh = &link_out->fh;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -1439,7 +1441,7 @@ int nfs41_readlink(
readlink_res.link_len = max_len - 1; readlink_res.link_len = max_len - 1;
readlink_res.link = link_out; readlink_res.link = link_out;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -1484,7 +1486,7 @@ int nfs41_access(
compound_add_op(&compound, OP_ACCESS, &access_args, &access_res); compound_add_op(&compound, OP_ACCESS, &access_args, &access_res);
access_args.access = requested; access_args.access = requested;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -1516,7 +1518,7 @@ int nfs41_send_sequence(
if (status) if (status)
goto out; goto out;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -1556,7 +1558,7 @@ int nfs41_delegreturn(
compound_add_op(&compound, OP_DELEGRETURN, &dr_args, &dr_res); compound_add_op(&compound, OP_DELEGRETURN, &dr_args, &dr_res);
dr_args.stateid = stateid; dr_args.stateid = stateid;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -1606,7 +1608,7 @@ enum nfsstat4 nfs41_fs_locations(
getattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT; getattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT;
getattr_res.info = &info; getattr_res.info = &info;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -1657,7 +1659,7 @@ enum nfsstat4 pnfs_rpc_layoutget(
layoutget_args.maxcount = session->fore_chan_attrs.ca_maxresponsesize - READ_OVERHEAD; layoutget_args.maxcount = session->fore_chan_attrs.ca_maxresponsesize - READ_OVERHEAD;
layoutget_res.u.res_ok.layout = layout; layoutget_res.u.res_ok.layout = layout;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -1720,7 +1722,7 @@ enum nfsstat4 pnfs_rpc_layoutcommit(
getattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT; getattr_res.obj_attributes.attr_vals_len = NFS4_OPAQUE_LIMIT;
getattr_res.info = &info; getattr_res.info = &info;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -1772,7 +1774,7 @@ enum nfsstat4 pnfs_rpc_layoutreturn(
layoutreturn_args.length = layout->layout.length; layoutreturn_args.length = layout->layout.length;
layoutreturn_args.stateid = &layout->layout.state; layoutreturn_args.stateid = &layout->layout.state;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;
@ -1820,7 +1822,7 @@ enum nfsstat4 pnfs_rpc_getdeviceinfo(
getdeviceinfo_args.notify_types.count = 0; getdeviceinfo_args.notify_types.count = 0;
getdeviceinfo_res.u.res_ok.device = device; getdeviceinfo_res.u.res_ok.device = device;
status = compound_encode_send_decode(session, &compound, 0, 0); status = compound_encode_send_decode(session, &compound, TRUE);
if (status) if (status)
goto out; goto out;