qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 18:26:48 -07:00
Code Releases Activity

cmd/internal/cov: close counter data files eagerly

Browse Source 
When reading the counter data files from a given pod, close the
underlying *os.File immediately after each one is read, as opposed to
using a deferred close in the loop (which will close them all at the
end of the function). Doing things this way avoids running into "too
many open files" when processing large clumps of counter data files.

Fixes #68468.

Change-Id: Ic1fe1d36c44d3f5d7318578cd18d0e65465d71d9
Reviewed-on: https://go-review.googlesource.com/c/go/+/598735
Reviewed-by: Cherry Mui <cherryyz@google.com>
LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
Than McIntosh 2024-07-16 19:13:47 +00:00
parent f2bcab5fb3
commit 355711821e
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/cmd/internal/cov/readcovdata.go
View File

@ -204,15 +204,12 @@ func (r *CovDataReader) visitPod(p pods.Pod) error {
} }
r.vis.VisitMetaDataFile(p.MetaFile, mfr) r.vis.VisitMetaDataFile(p.MetaFile, mfr)
// Read counter data files. processCounterDataFile := func(cdf string, k int) error {
for k, cdf := range p.CounterDataFiles {
cf, err := os.Open(cdf) cf, err := os.Open(cdf)
if err != nil { if err != nil {
return r.fatal("opening counter data file %s: %s", cdf, err) return r.fatal("opening counter data file %s: %s", cdf, err)
} }
defer func(f *os.File) { defer cf.Close()
f.Close()
}(cf)
var mr *MReader var mr *MReader
mr, err = NewMreader(cf) mr, err = NewMreader(cf)
if err != nil { if err != nil {
@ -236,6 +233,14 @@ func (r *CovDataReader) visitPod(p pods.Pod) error {
r.vis.VisitFuncCounterData(data) r.vis.VisitFuncCounterData(data)
} }
r.vis.EndCounterDataFile(cdf, cdr, p.Origins[k]) r.vis.EndCounterDataFile(cdf, cdr, p.Origins[k])
return nil
}
// Read counter data files.
for k, cdf := range p.CounterDataFiles {
if err := processCounterDataFile(cdf, k); err != nil {
return err
}
} }
r.vis.EndCounters() r.vis.EndCounters()