OpenAFS Master Repository branch, master, updated. openafs-devel-1_5_62-13-g64bad25

Gerrit Code Review
Tue, 1 Sep 2009 09:21:29 -0700 (PDT)

The following commit has been merged in the master branch:
commit 64bad257d66b7d70ebdb62a10217818730e2e0a6
Author: Andrew Deason <>
Date:   Wed Jul 29 11:56:34 2009 -0400

    DAFS: avoid shutdown hang during salvage
    Right now, when the fileserver shuts down, it tries to cancel any
    demand-salvages in progress. This causes the fileserver to hang, since
    during shutdown, the salvageserver may already be gone. This avoids
    cancelling in-progress salvages, and allows salvages to continue after
    the fileserver has shut down.
    To do this, the salvageserver now closes SALVSYNC sockets in spawned
    children, so the children don't get SALVSYNC requests directed at them,
    since they can't handle them. The salvageserver also now periodically
    scans for logs of salvaging children that have terminated, and
    incorporates them into SalsrvLog, just like it does for it's own
    children. The salvageserver children that actually perform salvages now
    also set the inUse volume header field to their programType, so the
    fileserver knows not to schedule new salvages for that volume in the
    event of a fileserver restart during a salvage.
    FIXES 124486
    Reviewed-by: Derrick Brashear <>
    Tested-by: Derrick Brashear <>

 src/vol/salvaged.c        |  119 +++++++++++++++++++++++++++++++++++++++++++++
 src/vol/salvsync-server.c |   32 +++++++++++-
 src/vol/vol-salvage.c     |   38 ++++++++++++++
 src/vol/volume.c          |   97 ++++++++++++------------------------
 src/vol/volume_inline.h   |   20 ++++++++
 5 files changed, 239 insertions(+), 67 deletions(-)

OpenAFS Master Repository