Skip to content

fix: Ensure logs are not interrupted when disk is full #4603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Ensure logs are not interrupted when disk is full #4603

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion pkg/logging/jsonfile/jsonfile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ package jsonfile

import (
"encoding/json"
"errors"
"fmt"
"io"
"path/filepath"
"strconv"
"strings"
"sync"
"syscall"
"time"

timetypes "github.com/docker/docker/api/types/time"
Expand All @@ -43,8 +45,26 @@ func Path(dataStore, ns, id string) string {
return filepath.Join(dataStore, "containers", ns, id, id+"-json.log")
}

type discardWriter struct {
writer io.Writer
}

func (pw *discardWriter) Write(p []byte) (int, error) {
n, err := pw.writer.Write(p)
if err != nil && errors.Is(err, syscall.ENOSPC) {
Copy link
Member

@AkihiroSuda AkihiroSuda Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the case of ENOSPC, the write should be retried with sleep?

Copy link
Contributor Author

@ningmingxiao ningmingxiao Nov 17, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I afraid that if long term retry failed the container main process may hang, because pipe is full.

Copy link
Member

@AkihiroSuda AkihiroSuda Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need to retry forever

Copy link
Contributor Author

@ningmingxiao ningmingxiao Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

how long do you think is appropriate? @AkihiroSuda

Copy link
Contributor Author

@ningmingxiao ningmingxiao Nov 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If retry with some sleep I afraid that the consumer's consumption of container logs is slower than the producer's production of logs.

return len(p), nil
Copy link
Member

@AkihiroSuda AkihiroSuda Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are you trying to do in this PR?
Doesn't seem correct to discard all syscall errors

Copy link
Contributor Author

@ningmingxiao ningmingxiao Nov 17, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, I make a mistack. @AkihiroSuda

}

return n, err
}

func newdiscardWriter(w io.Writer) *discardWriter {
return &discardWriter{writer: w}
}

func Encode(stdout <-chan string, stderr <-chan string, writer io.Writer) error {
enc := json.NewEncoder(writer)
discardWriter := newdiscardWriter(writer)
enc := json.NewEncoder(discardWriter)
var encMu sync.Mutex
var wg sync.WaitGroup
wg.Add(2)
Expand Down
Loading