MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-18 17:55:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

metacache: Always close block writer (#10973)

Browse Source 
In some cases a writer could be left behind unclosed, leaking compression blocks.

Always close and set compression concurrency to 2 which should be fine to keep up.
This commit is contained in:
Klaus Post 2020-11-25 09:37:30 -08:00 committed by GitHub
parent 31e6f60847
commit 0422eda6a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/metacache-stream.go
View File

@ -76,7 +76,7 @@ func newMetacacheWriter(out io.Writer, blockSize int) *metacacheWriter {
blockSize: blockSize, blockSize: blockSize,
} }
w.creator = func() error { w.creator = func() error {
s2w := s2.NewWriter(out, s2.WriterBlockSize(blockSize)) s2w := s2.NewWriter(out, s2.WriterBlockSize(blockSize), s2.WriterConcurrency(2))
w.mw = msgp.NewWriter(s2w) w.mw = msgp.NewWriter(s2w)
w.creator = nil w.creator = nil
if err := w.mw.WriteByte(metacacheStreamVersion); err != nil { if err := w.mw.WriteByte(metacacheStreamVersion); err != nil {
@ -206,7 +206,7 @@ func (w *metacacheWriter) Close() error {
func (w *metacacheWriter) Reset(out io.Writer) { func (w *metacacheWriter) Reset(out io.Writer) {
w.streamErr = nil w.streamErr = nil
w.creator = func() error { w.creator = func() error {
s2w := s2.NewWriter(out, s2.WriterBlockSize(w.blockSize)) s2w := s2.NewWriter(out, s2.WriterBlockSize(w.blockSize), s2.WriterConcurrency(2))
w.mw = msgp.NewWriter(s2w) w.mw = msgp.NewWriter(s2w)
w.creator = nil w.creator = nil
if err := w.mw.WriteByte(metacacheStreamVersion); err != nil { if err := w.mw.WriteByte(metacacheStreamVersion); err != nil {
@ -757,6 +757,7 @@ func newMetacacheBlockWriter(in <-chan metaCacheEntry, nextBlock func(b *metacac
var n int var n int
var buf bytes.Buffer var buf bytes.Buffer
block := newMetacacheWriter(&buf, 1<<20) block := newMetacacheWriter(&buf, 1<<20)
defer block.Close()
finishBlock := func() { finishBlock := func() {
err := block.Close() err := block.Close()
if err != nil { if err != nil {

1
cmd/metacache-stream_test.go
View File

@ -370,6 +370,7 @@ func Test_newMetacacheStream(t *testing.T) {
r := loadMetacacheSample(t) r := loadMetacacheSample(t)
var buf bytes.Buffer var buf bytes.Buffer
w := newMetacacheWriter(&buf, 1<<20) w := newMetacacheWriter(&buf, 1<<20)
defer w.Close()
err := r.readFn(func(object metaCacheEntry) bool { err := r.readFn(func(object metaCacheEntry) bool {
err := w.write(object) err := w.write(object)
if err != nil { if err != nil {