Prevent leaking file descriptor during snapshotting and provide better logging of errors #19093
Conversation
Codecov ReportAttention: Patch coverage is
Additional details and impacted files
... and 24 files with indirect coverage changes @@ Coverage Diff @@
## main #19093 +/- ##
==========================================
- Coverage 68.85% 68.78% -0.08%
==========================================
Files 420 420
Lines 35642 35654 +12
==========================================
- Hits 24541 24523 -18
- Misses 9676 9701 +25
- Partials 1425 1430 +5 Continue to review full report in Codecov by Sentry.
|
…r logging of errors Signed-off-by: Marek Siarkowicz <[email protected]>
serathius
force-pushed
the
snapshot-leak
branch
from
b3a68b9 to
a1d5008
Compare
|
We need to close all previous similar PRs, one of which is #18200 |
| if err != nil { | ||
| return "", fmt.Errorf("could not open %s (%w)", partpath, err) | ||
| } | ||
| defer func() { | ||
| err = f.Close() | ||
| if err != nil && !errors.Is(err, os.ErrClosed) { |
There was a problem hiding this comment.
It works. But I think a better and more explicit way is to use sync.Once to ensure f.Close is only executed once. So that it's well aware that we need to close the file before renaming, but also need to ensure it's closed in case early return due to any error.
There was a problem hiding this comment.
Checked https://pkg.go.dev/os#File.Close and the api can guarantee it can be executed only once. sync.Once is not neccesary here.
There was a problem hiding this comment.
Not a big deal, please feel free to merge this PR and backport to 3.5 and 3.4.
|
@serathius: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
| @@ -98,5 +119,5 @@ func SaveWithVersion(ctx context.Context, lg *zap.Logger, cfg clientv3.Config, d | |||
| return resp.Version, fmt.Errorf("could not rename %s to %s (%w)", partpath, dbPath, err) | |||
| } | |||
| lg.Info("saved", zap.String("path", dbPath)) | |||
| return resp.Version, nil | |||
| return resp.Version, err | |||
There was a problem hiding this comment.
just curious about using err here. nil is more accurate
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: fuweid, serathius The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
cc @ahrtr @fuweid @ivanvc
Found case where a leaked file descriptor prevents data being deleted from disk and filling up the disk.
Would like to backport it to all v3.5 and v3.4