-
Notifications
You must be signed in to change notification settings - Fork 136
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: buffer the logs on the file system before sending them to Object…
… Storage (#5866)
- Loading branch information
Showing
9 changed files
with
214 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| package bufferedstream | ||
|
|
||
| import ( | ||
| "context" | ||
| "io" | ||
| "os" | ||
|
|
||
| "github.com/pkg/errors" | ||
| ) | ||
|
|
||
| // bufferedStream is a mechanism to buffer data in FS instead of memory. | ||
| type bufferedStream struct { | ||
| ctx context.Context | ||
| end context.CancelCauseFunc | ||
| file *os.File | ||
| size int | ||
| } | ||
|
|
||
| type BufferedStream interface { | ||
| io.Reader | ||
| Len() int | ||
| Cleanup() error | ||
| Err() error | ||
| Ready() <-chan struct{} | ||
| } | ||
|
|
||
| func newBufferedStream(file *os.File, source io.Reader) BufferedStream { | ||
| ctx, end := context.WithCancelCause(context.Background()) | ||
| stream := &bufferedStream{ctx: ctx, end: end, file: file} | ||
|
|
||
| // Stream the data into file buffer | ||
| go func() { | ||
| size, err := io.Copy(file, source) | ||
| stream.size = int(size) | ||
| if err == nil || errors.Is(err, io.EOF) { | ||
| _, err = file.Seek(0, io.SeekStart) | ||
| } | ||
| if err == nil { | ||
| err = io.EOF | ||
| } | ||
| stream.end(err) | ||
| }() | ||
|
|
||
| return stream | ||
| } | ||
|
|
||
| func (b *bufferedStream) Read(p []byte) (n int, err error) { | ||
| <-b.ctx.Done() | ||
| return b.file.Read(p) | ||
| } | ||
|
|
||
| func (b *bufferedStream) Err() error { | ||
| return context.Cause(b.ctx) | ||
| } | ||
|
|
||
| func (b *bufferedStream) Ready() <-chan struct{} { | ||
| return b.ctx.Done() | ||
| } | ||
|
|
||
| func (b *bufferedStream) Len() int { | ||
| <-b.ctx.Done() | ||
| return b.size | ||
| } | ||
|
|
||
| func (b *bufferedStream) Cleanup() error { | ||
| b.end(nil) | ||
| return os.Remove(b.file.Name()) | ||
| } | ||
|
|
||
| func NewBufferedStream(dirPath, prefix string, source io.Reader) (BufferedStream, error) { | ||
| file, err := os.CreateTemp(dirPath, prefix) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return newBufferedStream(file, source), nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| package bufferedstream | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "io" | ||
| "os" | ||
| "sync" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestBufferedStream(t *testing.T) { | ||
| inputStream := bytes.NewBuffer([]byte("test input stream")) | ||
| file, err := os.CreateTemp("", "testbuffer") | ||
| if err != nil { | ||
| t.Error("failed to create temp file") | ||
| return | ||
| } | ||
| stream := newBufferedStream(file, inputStream) | ||
| defer stream.Cleanup() | ||
| select { | ||
| case <-stream.Ready(): | ||
| case <-time.After(1 * time.Second): | ||
| t.Error("timed out waiting for stream to be ready") | ||
| return | ||
| } | ||
|
|
||
| result, _ := io.ReadAll(stream) | ||
| assert.Equal(t, []byte("test input stream"), result) | ||
| } | ||
|
|
||
| func TestBufferedStream_Cleanup(t *testing.T) { | ||
| inputStream := bytes.NewBuffer([]byte("test input stream")) | ||
| file, err := os.CreateTemp("", "testbuffer") | ||
| if err != nil { | ||
| t.Error("failed to create temp file") | ||
| return | ||
| } | ||
| stream := newBufferedStream(file, inputStream) | ||
| select { | ||
| case <-stream.Ready(): | ||
| case <-time.After(1 * time.Second): | ||
| stream.Cleanup() | ||
| t.Error("timed out waiting for stream to be ready") | ||
| return | ||
| } | ||
|
|
||
| statBefore, statBeforeErr := os.Stat(file.Name()) | ||
|
|
||
| err = stream.Cleanup() | ||
| stat, statErr := os.Stat(file.Name()) | ||
|
|
||
| assert.NoError(t, statBeforeErr) | ||
| assert.NotEqual(t, nil, statBefore) | ||
| assert.NoError(t, err) | ||
| assert.Equal(t, nil, stat) | ||
| assert.Error(t, statErr) | ||
| } | ||
|
|
||
| func TestBufferedStream_Len(t *testing.T) { | ||
| inputStream := bytes.NewBuffer([]byte("test input stream")) | ||
| inputStreamLen := inputStream.Len() | ||
| file, err := os.CreateTemp("", "testbuffer") | ||
| if err != nil { | ||
| t.Error("failed to create temp file") | ||
| return | ||
| } | ||
| stream := newBufferedStream(file, inputStream) | ||
| defer stream.Cleanup() | ||
|
|
||
| size := -1 | ||
| var wg sync.WaitGroup | ||
| wg.Add(1) | ||
| go func() { | ||
| size = stream.Len() | ||
| wg.Done() | ||
| }() | ||
|
|
||
| select { | ||
| case <-stream.Ready(): | ||
| case <-time.After(1 * time.Second): | ||
| t.Error("timed out waiting for stream to be ready") | ||
| return | ||
| } | ||
|
|
||
| wg.Wait() | ||
| assert.Equal(t, inputStreamLen, size) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters