jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-19 15:30:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vol: make namei_ListAFSSubDirs deal with multiple/bad linktables

Browse Source 
The salvager ends up deadlocking when multiple linktables exist
in the same volume group special directory.  The issue is that we
open and flock all discovered linktables, but only close out the
last one found.  Consequently, when our child scans the linktables
again, we deadlock against the locked and leaked descriptor(s) our
parent left around before forking.

While we have so far been unable to root-cause the actual creation
of spurious linktables, this patch will at least stop the salvager
from deadlocking against itself when this occurs.

Change-Id: I67821f2c99663c56e4ec0b008e1d2d3a8751df0e
Reviewed-on: http://gerrit.openafs.org/2979
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Tom Keiser 2010-10-14 01:24:03 -04:00 committed by Derrick Brashear
parent f9409fcdff
commit 19d2e0e34b
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/vol/namei_ops.c
View File

@ -1846,14 +1846,31 @@ _namei_examine_special(char * path1,
{
int ret = 0;
struct ViceInodeInfo info;
afs_uint32 inode_vgid;
if (DecodeInode(path1, dname, &info, myIH->ih_vid) < 0) {
ret = 0;
goto error;
}
#ifdef AFS_NT40_ENV
inode_vgid = myIH->ih_vid;
#else
inode_vgid = (info.inodeNumber >> NAMEI_UNIQSHIFT) & NAMEI_UNIQMASK;
#endif
if (info.u.param[2] != VI_LINKTABLE) {
info.linkCount = 1;
} else if ((info.u.param[0] != myIH->ih_vid) ||
(inode_vgid != myIH->ih_vid)) {
/* VGID encoded in linktable filename and/or OGM data isn't
* consistent with VGID encoded in namei path */
Log("namei_ListAFSSubDirs: warning: inconsistent linktable "
"filename \"%s/%s\"; salvager will delete it "
"(dir_vgid=%u, inode_vgid=%u, ogm_vgid=%u)\n",
path1, dname, myIH->ih_vid,
(unsigned int)inode_vgid,
info.u.param[0]);
} else {
char path2[512];
/* Open this handle */
@ -2414,6 +2431,11 @@ namei_ListAFSSubDirs(IHandle_t * dirIH,
ninodes += code;
#endif
if (linkHandle.fd_fd == INVALID_FD) {
Log("namei_ListAFSSubDirs: warning: VG %u does not have a link table; "
"salvager will recreate it.\n", dirIH->ih_vid);
}
/* Now run through all the other subdirs */
namei_HandleToVolDir(&name, &myIH);
strlcpy(path1, name.n_path, sizeof(path1));