Skip to content

Commit

Permalink
fix high s3ng memory usage after #3272, same as #1940 (#3373)
Browse files Browse the repository at this point in the history
  • Loading branch information
wkloucek authored Oct 19, 2022
1 parent f476949 commit e05ac24
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions pkg/storage/fs/s3ng/blobstore/blobstore.go
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,6 @@ func (p *PrometheusAwareReadSeekCloser) Close() error {

// Upload stores some data in the blobstore under the given key
func (bs *Blobstore) Upload(node *node.Node, reader io.Reader) error {
reader = &PrometheusAwareReader{
r: reader,
m: metrics.Tx,
}
size := int64(-1)
if file, ok := reader.(*os.File); ok {
info, err := file.Stat()
Expand All @@ -118,6 +114,11 @@ func (bs *Blobstore) Upload(node *node.Node, reader io.Reader) error {
size = info.Size()
}

reader = &PrometheusAwareReader{
r: reader,
m: metrics.Tx,
}

_, err := bs.client.PutObject(context.Background(), bs.bucket, bs.path(node), reader, size, minio.PutObjectOptions{ContentType: "application/octet-stream"})

if err != nil {
Expand Down

0 comments on commit e05ac24

Please sign in to comment.