OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-stable-1_6_0pre2-73-gc0aa61b
Gerrit Code Review
gerrit@openafs.org
Wed, 9 Mar 2011 04:59:05 -0800 (PST)
The following commit has been merged in the openafs-stable-1_6_x branch:
commit c0aa61b7914c724b192c78d67b3bc963be4dbcd5
Author: Andrew Deason <adeason@sinenomine.net>
Date: Mon Mar 7 11:08:26 2011 -0600
RX: Avoid timing out non-kernel busy channels
When we encounter a "busy" call channel (indicated by receiving
RX_PACKET_TYPE_BUSY packets), we can error out a call with
RX_CALL_TIMEOUT to try and get the application code to retry the call.
However, many RX applications are not aware of this, and will just
fail with an error upon receiving a single busy packet.
So instead, make this behavior optional, and only do it if the
application tells us what specific error it expects to receive when a
busy call channel is detected. Enable this behavior for the Unix cache
manager, as it can cope with receiving an RX_CALL_TIMEOUT error in
this scenario.
Bump shlibafsrpc minor version to 5 instead of 3, so we don't collide
with the shlibafsrpc versions on the master branch.
Reviewed-on: http://gerrit.openafs.org/4159
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit eddcee3ad518dff9fbfda790640c5bfd2e97ef5a)
Change-Id: I38981ad3e3c2cbb03c516c02481a2f44cb5f9acf
Reviewed-on: http://gerrit.openafs.org/4182
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
src/afs/afs_call.c | 2 ++
src/afs/afs_pag_call.c | 1 +
src/libafsrpc/afsrpc.def | 2 ++
src/libafsrpc/afsrpc.exp | 1 +
src/rx/rx.c | 33 +++++++++++++++++++++++++++++----
src/rx/rx_prototypes.h | 1 +
src/shlibafsrpc/Makefile.in | 2 +-
src/shlibafsrpc/libafsrpc.map | 1 +
8 files changed, 38 insertions(+), 5 deletions(-)
--
OpenAFS Master Repository