arno/clair
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updater: Fix Ubuntu's partial update bug.

Browse Source 
Deferring file closing causes `too many open files` (exceeding fs.file-max) on some platforms!
This commit is contained in:
Quentin Machu 2015-12-16 15:30:03 -05:00
parent 8c1d3c9a86
commit c055c33cf8
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
updater/fetchers/ubuntu.go
View File

@ -131,7 +131,6 @@ func (fetcher *UbuntuFetcher) FetchUpdate() (resp updater.FetcherResponse, err e
// commit. // commit.
continue continue
} }
defer file.Close()
v, pkgs, unknownReleases, err := parseUbuntuCVE(file) v, pkgs, unknownReleases, err := parseUbuntuCVE(file)
if err != nil { if err != nil {
@ -154,6 +153,13 @@ func (fetcher *UbuntuFetcher) FetchUpdate() (resp updater.FetcherResponse, err e
dbRevisionNumberInt, _ := strconv.Atoi(dbRevisionNumber) dbRevisionNumberInt, _ := strconv.Atoi(dbRevisionNumber)
revisionNumber = dbRevisionNumberInt revisionNumber = dbRevisionNumberInt
} }
// Close the file manually.
//
// We do that instead of using defer because defer works on a function-level scope.
// We would open many files and close them all at once at the end of the function,
// which could lead to exceed fs.file-max.
file.Close()
} }
// Add flag information // Add flag information
@ -174,7 +180,6 @@ func collectModifiedVulnerabilities(revision int, dbRevision, repositoryLocalPat
log.Errorf("could not open Ubuntu vulnerabilities repository's folder: %s", err) log.Errorf("could not open Ubuntu vulnerabilities repository's folder: %s", err)
return nil, ErrFilesystem return nil, ErrFilesystem
} }
defer d.Close()
// Get the FileInfo of all the files in the directory. // Get the FileInfo of all the files in the directory.
names, err := d.Readdirnames(-1) names, err := d.Readdirnames(-1)
@ -189,6 +194,13 @@ func collectModifiedVulnerabilities(revision int, dbRevision, repositoryLocalPat
modifiedCVE[folder+"/"+name] = struct{}{} modifiedCVE[folder+"/"+name] = struct{}{}
} }
} }
// Close the file manually.
//
// We do that instead of using defer because defer works on a function-level scope.
// We would open many files and close them all at once at the end of the function,
// which could lead to exceed fs.file-max.
d.Close()
} }
return modifiedCVE, nil return modifiedCVE, nil