mirror of
https://git.openafs.org/openafs.git
synced 2025-01-20 16:00:12 +00:00
vol-salvage: Unlock volumes before exiting
Normally, volume locks acquired by an exiting salvaging process would be automatically given up when the process exits, since our FDs are closed. However, if we exit by calling Exit() or Abort(), we gracefully shutdown our SYNC channels before exiting. For FSSYNC, this can result in the fileserver trying to online the volumes we had checked out but had not yet checked back in, so the fileserver may try to online a volume we have locked, before the locks have been released. To avoid this, unlock all volume locks for all partitions before we shutdown SYNC channels on exit. Change-Id: Idcda5fcf4639da7d4b951bea36606ea8daf68f3c Reviewed-on: http://gerrit.openafs.org/7514 Tested-by: BuildBot <buildbot@rampaginggeek.com> Reviewed-by: Derrick Brashear <shadow@dementix.org> Tested-by: Derrick Brashear <shadow@dementix.org>
This commit is contained in:
parent
80359f562a
commit
fff80cb198
@ -4672,6 +4672,18 @@ Exit(int code)
|
||||
|
||||
#ifdef AFS_DEMAND_ATTACH_FS
|
||||
if (programType == salvageServer) {
|
||||
/* release all volume locks before closing down our SYNC channels.
|
||||
* the fileserver may try to online volumes we have checked out when
|
||||
* we close down FSSYNC, so we should make sure we don't have those
|
||||
* volumes locked when it does */
|
||||
struct DiskPartition64 *dp;
|
||||
int i;
|
||||
for (i = 0; i <= VOLMAXPARTS; i++) {
|
||||
dp = VGetPartitionById(i, 0);
|
||||
if (dp) {
|
||||
VLockFileReinit(&dp->volLockFile);
|
||||
}
|
||||
}
|
||||
# ifdef SALVSYNC_BUILD_CLIENT
|
||||
VDisconnectSALV();
|
||||
# endif
|
||||
|
Loading…
Reference in New Issue
Block a user