cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-05 15:43:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[release-branch.go1.21] 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 #68491.
Updates #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>
(cherry picked from commit 355711821eea51c6456a31ab61d0dc2e9db034f7)
Reviewed-on: https://go-review.googlesource.com/c/go/+/599055
This commit is contained in:
Than McIntosh 2024-07-16 19:13:47 +00:00 committed by Cherry Mui
parent d149ce82af
commit dabed2e09a
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)
// Read counter data files.
for k, cdf := range p.CounterDataFiles {
processCounterDataFile := func(cdf string, k int) error {
cf, err := os.Open(cdf)
if err != nil {
return r.fatal("opening counter data file %s: %s", cdf, err)
}
defer func(f *os.File) {
f.Close()
}(cf)
defer cf.Close()
var mr *MReader
mr, err = NewMreader(cf)
if err != nil {
@ -236,6 +233,14 @@ func (r *CovDataReader) visitPod(p pods.Pod) error {
r.vis.VisitFuncCounterData(data)
}
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()