OpenAFS Master Repository branch, openafs-stable-1_6_x, updated. openafs-stable-1_6_0pre6-48-g9a2890c
Gerrit Code Review
gerrit@openafs.org
Fri, 8 Jul 2011 22:08:46 -0700 (PDT)
The following commit has been merged in the openafs-stable-1_6_x branch:
commit 9a2890c4a4b3bf359bd759ef26139d20045b87eb
Author: Andrew Deason <adeason@sinenomine.net>
Date: Fri Jul 1 14:25:05 2011 -0500
DAFS: Do not clear salv state on fssync salvage
When a volume is put into an error state via the FSYNC_VOL_FORCE_ERROR
command, we clear the salvage state informaton on it, since we're
forcing it offline and thus inaccessible. However, if we are forcing
it to an error state because the volume needs salvaging, we just
salvage it. In this case, do not clear the salvage state, since we
need to know if we've already requested or scheduled a salvage so we
can correctly keep track of the number of salvages performed.
Reviewed-on: http://gerrit.openafs.org/4900
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 1ecac71e50e75ce5a45e297d57c480e850975af7)
Change-Id: I313f4c4093f3b4f5ee501ef7537d05b557946a70
Reviewed-on: http://gerrit.openafs.org/4948
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
src/vol/fssync-server.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
--
OpenAFS Master Repository