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

recovery: trigger recovery on RESTART_RECLAIM_NEEDED

Browse source 
adds a check for sequence flag SEQ4_STATUS_RESTART_RECLAIM_NEEDED in nfs41_recover_sequence_flags().  if other _STATE_REVOKED flags are set, call nfs41_client_state_revoked() as normal but follow it up with a RECLAIM_COMPLETE.  otherwise, reclaim all locks with nfs41_recover_client_state().  like other callers of nfs41_recover_client_state(), we need to handle BADSESSION errors because the recovery operations are sent with try_recovery=FALSE.  because this logic is similar to our default NFS4ERR_BADSESSION handling, i moved the common code into a new nfs41_recover_session() function in recovery.c

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2011-12-19 16:03:33 -05:00 • committed by unknown
parent ab51beeb98
commit 6c1c300a3b
3 changed files with 62 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

52
daemon/recovery.c
View file

@ -70,6 +70,36 @@ void nfs41_recovery_finish(
}
/* session/client/state recovery */
int nfs41_recover_session(
IN nfs41_session *session,
IN bool_t client_state_lost)
{
enum nfsstat4 status = NFS4_OK;
restart_recovery:
/* recover the session */
status = nfs41_session_renew(session);
if (status == NFS4ERR_STALE_CLIENTID) {
/* recover the client */
client_state_lost = TRUE;
status = nfs41_client_renew(session->client);
if (status == NFS4_OK)
goto restart_recovery; /* resume session recovery */
eprintf("nfs41_client_renew() failed with %d\n", status);
} else if (status) {
eprintf("nfs41_session_renew() failed with %d\n", status);
} else if (client_state_lost) {
/* recover the client's state */
status = nfs41_recover_client_state(session, session->client);
if (status == NFS4ERR_BADSESSION)
goto restart_recovery;
}
return status;
}
void nfs41_recover_sequence_flags(
IN nfs41_session *session,
IN uint32_t flags)
@ -78,16 +108,32 @@ void nfs41_recover_sequence_flags(
(SEQ4_STATUS_EXPIRED_ALL_STATE_REVOKED
| SEQ4_STATUS_EXPIRED_SOME_STATE_REVOKED
| SEQ4_STATUS_ADMIN_STATE_REVOKED);
const uint32_t restarted = flags &
SEQ4_STATUS_RESTART_RECLAIM_NEEDED;
/* no state recovery needed */
if (revoked == 0)
if (revoked == 0 && restarted == 0)
return;
if (!nfs41_recovery_start_or_wait(session->client))
return;
/* free stateids and attempt to recover them */
nfs41_client_state_revoked(session, session->client, revoked);
if (revoked) {
/* free stateids and attempt to recover them */
nfs41_client_state_revoked(session, session->client, revoked);
/* if RESTART_RECLAIM_NEEDED is also set, just do RECLAIM_COMPLETE */
if (restarted) nfs41_reclaim_complete(session);
} else if (restarted) {
/* do server reboot state recovery */
uint32_t status = nfs41_recover_client_state(session, session->client);
if (status == NFS4ERR_BADSESSION) {
/* recover the session and finish state recovery */
nfs41_recover_session(session, TRUE);
}
}
nfs41_recovery_finish(session->client);
}