Skip to content
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

fix s3logger memory usage #764

Merged
merged 2 commits into from
Aug 26, 2024
Merged

fix s3logger memory usage #764

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d5a8565
fix s3logger memory usage
frostbyte73 Aug 26, 2024
201f343
remove hard coded value
frostbyte73 Aug 26, 2024
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
26 changes: 16 additions & 10 deletions pkg/pipeline/sink/uploader/s3.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"net/http"
"net/url"
"os"
"strings"
"sync"

"github.com/aws/aws-sdk-go/aws"
Expand Down Expand Up @@ -56,27 +57,30 @@ func (r S3Retryer) ShouldRetry(_ *request.Request) bool {
type S3Logger struct {
mu sync.Mutex
msgs []string
idx int
}

func (l *S3Logger) Log(args ...interface{}) {
msg := "aws sdk:"
var sb strings.Builder
sb.WriteString("aws sdk:")
for range len(args) {
msg += " %v"
sb.WriteString(" %v")
}

l.mu.Lock()
if len(l.msgs) >= 10 {
l.msgs = append(l.msgs[1:], msg)
} else {
l.msgs = append(l.msgs, msg)
}
l.msgs[l.idx%len(l.msgs)] = fmt.Sprintf(sb.String(), args...)
l.idx++
l.mu.Unlock()
}

func (l *S3Logger) PrintLogs() {
l.mu.Lock()
for _, msg := range l.msgs {
logger.Debugw(msg)
size := len(l.msgs)
for range size {
if msg := l.msgs[l.idx%size]; msg != "" {
logger.Debugw(msg)
}
l.idx++
}
l.mu.Unlock()
}
Expand Down Expand Up @@ -201,7 +205,9 @@ func (u *S3Uploader) getBucketLocation() (string, error) {

func (u *S3Uploader) upload(localFilepath, storageFilepath string, outputType types.OutputType) (string, int64, error) {
// use a separate logger for each upload
l := &S3Logger{}
l := &S3Logger{
msgs: make([]string, 10),
}
u.mu.Lock()
u.awsConfig.Logger = l
sess, err := session.NewSession(u.awsConfig)
Expand Down
Loading