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

session: delay updates to max_slots after a recall/error

Browse source 
because there could be lots of rpcs in flight when we get a CB_RECALL_SLOT or NFS4ERR_BADSLOT error, we're likely to get some replies with an old value for target_highest_slotid.  added a MAX_SLOTS_DELAY of 2 seconds to ignore changes to target_highest_slotid after CB_RECALL_SLOT or NFS4ERR_BADSLOT to prevent max_slots from jumping around between the old and new values

Signed-off-by: Casey Bodley <cbodley@citi.umich.edu>
This commit is contained in:
Casey Bodley 2012-05-15 11:20:04 -04:00 • committed by Olga Kornievskaia
parent 30e8df149e
commit 22ff7afc92
2 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
daemon/nfs41.h
View file

@ -222,6 +222,7 @@ typedef struct __nfs41_slot_table {
uint32_t max_slots; uint32_t max_slots;
uint32_t highest_used; uint32_t highest_used;
uint32_t num_used; uint32_t num_used;
ULONGLONG target_delay;
CRITICAL_SECTION lock; CRITICAL_SECTION lock;
CONDITION_VARIABLE cond; CONDITION_VARIABLE cond;
} nfs41_slot_table; } nfs41_slot_table;

16
daemon/nfs41_session.c
View file

@ -29,6 +29,11 @@
#include "daemon_debug.h" #include "daemon_debug.h"
/* after a CB_RECALL_SLOT or NFS4ERR_BADSLOT, wait a short time for the
* SEQUENCE.target_highest_slotid to catch up before updating max_slots again */
#define MAX_SLOTS_DELAY 2000 /* in milliseconds */
/* predicate for nfs41_slot_table.cond */ /* predicate for nfs41_slot_table.cond */
static int slot_table_avail( static int slot_table_avail(
IN const nfs41_slot_table *table) IN const nfs41_slot_table *table)
@ -47,6 +52,7 @@ static void init_slot_table(nfs41_slot_table *table)
table->used_slots[i] = 0; table->used_slots[i] = 0;
} }
table->highest_used = table->num_used = 0; table->highest_used = table->num_used = 0;
table->target_delay = 0;
/* wake any threads waiting on a slot */ /* wake any threads waiting on a slot */
if (slot_table_avail(table)) if (slot_table_avail(table))
@ -84,7 +90,10 @@ void nfs41_session_bump_seq(
if (slotid < NFS41_MAX_NUM_SLOTS) if (slotid < NFS41_MAX_NUM_SLOTS)
table->seq_nums[slotid]++; table->seq_nums[slotid]++;
resize_slot_table(table, target_highest_slotid); /* adjust max_slots in response to changes in target_highest_slotid,
* but not immediately after a CB_RECALL_SLOT or NFS4ERR_BADSLOT error */
if (table->target_delay <= GetTickCount64())
resize_slot_table(table, target_highest_slotid);
LeaveCriticalSection(&table->lock); LeaveCriticalSection(&table->lock);
ReleaseSRWLockShared(&session->client->session_lock); ReleaseSRWLockShared(&session->client->session_lock);
@ -166,6 +175,7 @@ int nfs41_session_recall_slot(
AcquireSRWLockShared(&session->client->session_lock); AcquireSRWLockShared(&session->client->session_lock);
EnterCriticalSection(&table->lock); EnterCriticalSection(&table->lock);
resize_slot_table(table, target_highest_slotid); resize_slot_table(table, target_highest_slotid);
table->target_delay = GetTickCount64() + MAX_SLOTS_DELAY;
LeaveCriticalSection(&table->lock); LeaveCriticalSection(&table->lock);
ReleaseSRWLockShared(&session->client->session_lock); ReleaseSRWLockShared(&session->client->session_lock);
@ -186,8 +196,10 @@ int nfs41_session_bad_slot(
/* avoid using any slots >= bad_slotid */ /* avoid using any slots >= bad_slotid */
EnterCriticalSection(&table->lock); EnterCriticalSection(&table->lock);
if (table->max_slots > args->sa_slotid) if (table->max_slots > args->sa_slotid) {
resize_slot_table(table, args->sa_slotid); resize_slot_table(table, args->sa_slotid);
table->target_delay = GetTickCount64() + MAX_SLOTS_DELAY;
}
LeaveCriticalSection(&table->lock); LeaveCriticalSection(&table->lock);
/* get a new slot */ /* get a new slot */