MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reuse buffers when writing metadata (#13040)

Browse Source 
Simplify returning buffers.

Tested using `warp mixed --duration=1m --obj.size=100K`:

```
Operation: DELETE
Operations: 7148 -> 7642
* Average: +6.77% (+8.1) obj/s
-------------------
Operation: GET
Operations: 32200 -> 34403
* Average: +6.74% (+3.5 MiB/s) throughput, +6.74% (+36.2) obj/s
* First Byte: Average: -105.403µs (-3%), Median: -309µs (-11%), Best: -2.7µs (-0%), Worst: +3.5637ms (+3%)
-------------------
Operation: PUT
Operations: 10741 -> 11475
* Average: +6.78% (+1.2 MiB/s) throughput, +6.78% (+12.1) obj/s
-------------------
Operation: STAT
Operations: 21465 -> 22927
* Average: +6.71% (+24.0) obj/s
```
This commit is contained in:
Klaus Post 2021-08-23 20:17:27 +02:00 committed by GitHub
parent 8315bcd0d8
commit 1080609c86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/metacache-entries.go
View File

@ -497,9 +497,7 @@ func (m *metaCacheEntriesSorted) forwardTo(s string) {
}) })
if m.reuse { if m.reuse {
for i, entry := range m.o[:idx] { for i, entry := range m.o[:idx] {
if len(entry.metadata) >= metaDataReadDefault && len(entry.metadata) < metaDataReadDefault*4 { metaDataPoolPut(entry.metadata)
metaDataPool.Put(entry.metadata)
}
m.o[i].metadata = nil m.o[i].metadata = nil
} }
} }
@ -517,9 +515,7 @@ func (m *metaCacheEntriesSorted) forwardPast(s string) {
}) })
if m.reuse { if m.reuse {
for i, entry := range m.o[:idx] { for i, entry := range m.o[:idx] {
if len(entry.metadata) >= metaDataReadDefault && len(entry.metadata) < metaDataReadDefault*4 { metaDataPoolPut(entry.metadata)
metaDataPool.Put(entry.metadata)
}
m.o[i].metadata = nil m.o[i].metadata = nil
} }
} }
@ -739,9 +735,7 @@ func (m *metaCacheEntriesSorted) truncate(n int) {
if len(m.o) > n { if len(m.o) > n {
if m.reuse { if m.reuse {
for i, entry := range m.o[n:] { for i, entry := range m.o[n:] {
if len(entry.metadata) >= metaDataReadDefault && len(entry.metadata) < metaDataReadDefault*4 { metaDataPoolPut(entry.metadata)
metaDataPool.Put(entry.metadata)
}
m.o[n+i].metadata = nil m.o[n+i].metadata = nil
} }
} }

20
cmd/metacache-stream.go
View File

@ -143,9 +143,7 @@ func (w *metacacheWriter) write(objs ...metaCacheEntry) error {
return err return err
} }
if w.reuseBlocks || o.reusable { if w.reuseBlocks || o.reusable {
if cap(o.metadata) >= metaDataReadDefault && cap(o.metadata) < metaDataReadDefault*4 { metaDataPoolPut(o.metadata)
metaDataPool.Put(o.metadata)
}
} }
} }
@ -360,12 +358,12 @@ func (r *metacacheReader) next() (metaCacheEntry, error) {
r.err = err r.err = err
return m, err return m, err
} }
m.metadata, err = r.mr.ReadBytes(metaDataPool.Get().([]byte)[:0]) m.metadata, err = r.mr.ReadBytes(metaDataPoolGet())
if err == io.EOF { if err == io.EOF {
err = io.ErrUnexpectedEOF err = io.ErrUnexpectedEOF
} }
if len(m.metadata) == 0 && cap(m.metadata) >= metaDataReadDefault { if len(m.metadata) == 0 && cap(m.metadata) >= metaDataReadDefault {
metaDataPool.Put(m.metadata) metaDataPoolPut(m.metadata)
m.metadata = nil m.metadata = nil
} }
r.err = err r.err = err
@ -520,15 +518,15 @@ func (r *metacacheReader) readN(n int, inclDeleted, inclDirs bool, prefix string
r.mr.R.Skip(1) r.mr.R.Skip(1)
return metaCacheEntriesSorted{o: res}, io.EOF return metaCacheEntriesSorted{o: res}, io.EOF
} }
if meta.metadata, err = r.mr.ReadBytes(metaDataPool.Get().([]byte)[:0]); err != nil { if meta.metadata, err = r.mr.ReadBytes(metaDataPoolGet()); err != nil {
if err == io.EOF { if err == io.EOF {
err = io.ErrUnexpectedEOF err = io.ErrUnexpectedEOF
} }
r.err = err r.err = err
return metaCacheEntriesSorted{o: res}, err return metaCacheEntriesSorted{o: res}, err
} }
if len(meta.metadata) == 0 && cap(meta.metadata) >= metaDataReadDefault { if len(meta.metadata) == 0 {
metaDataPool.Put(meta.metadata) metaDataPoolPut(meta.metadata)
meta.metadata = nil meta.metadata = nil
} }
if !inclDirs && meta.isDir() { if !inclDirs && meta.isDir() {
@ -579,15 +577,15 @@ func (r *metacacheReader) readAll(ctx context.Context, dst chan<- metaCacheEntry
r.err = err r.err = err
return err return err
} }
if meta.metadata, err = r.mr.ReadBytes(metaDataPool.Get().([]byte)[:0]); err != nil { if meta.metadata, err = r.mr.ReadBytes(metaDataPoolGet()); err != nil {
if err == io.EOF { if err == io.EOF {
err = io.ErrUnexpectedEOF err = io.ErrUnexpectedEOF
} }
r.err = err r.err = err
return err return err
} }
if len(meta.metadata) == 0 && cap(meta.metadata) >= metaDataReadDefault { if len(meta.metadata) == 0 {
metaDataPool.Put(meta.metadata) metaDataPoolPut(meta.metadata)
meta.metadata = nil meta.metadata = nil
} }
select { select {

17
cmd/xl-storage-format-v2.go
View File

@ -1437,6 +1437,19 @@ const metaDataReadDefault = 4 << 10
// Return used metadata byte slices here. // Return used metadata byte slices here.
var metaDataPool = sync.Pool{New: func() interface{} { return make([]byte, 0, metaDataReadDefault) }} var metaDataPool = sync.Pool{New: func() interface{} { return make([]byte, 0, metaDataReadDefault) }}
// metaDataPoolGet will return a byte slice with capacity at least metaDataReadDefault.
// It will be length 0.
func metaDataPoolGet() []byte {
return metaDataPool.Get().([]byte)[:0]
}
// metaDataPoolPut will put an unused small buffer back into the pool.
func metaDataPoolPut(buf []byte) {
if cap(buf) >= metaDataReadDefault && cap(buf) < metaDataReadDefault*4 {
metaDataPool.Put(buf)
}
}
// readXLMetaNoData will load the metadata, but skip data segments. // readXLMetaNoData will load the metadata, but skip data segments.
// This should only be used when data is never interesting. // This should only be used when data is never interesting.
// If data is not xlv2, it is returned in full. // If data is not xlv2, it is returned in full.
@ -1448,9 +1461,7 @@ func readXLMetaNoData(r io.Reader, size int64) ([]byte, error) {
hasFull = false hasFull = false
} }
buf := metaDataPool.Get().([]byte) buf := metaDataPoolGet()[:initial]
buf = buf[:initial]
_, err := io.ReadFull(r, buf) _, err := io.ReadFull(r, buf)
if err != nil { if err != nil {
return nil, fmt.Errorf("readXLMetaNoData.ReadFull: %w", err) return nil, fmt.Errorf("readXLMetaNoData.ReadFull: %w", err)

19
cmd/xl-storage.go
View File

@ -903,7 +903,8 @@ func (s *xlStorage) DeleteVersion(ctx context.Context, volume, path string, fi F
} }
} }
if !lastVersion { if !lastVersion {
buf, err = xlMeta.AppendTo(nil) buf, err = xlMeta.AppendTo(metaDataPoolGet())
defer metaDataPoolPut(buf)
if err != nil { if err != nil {
return err return err
} }
@ -970,7 +971,8 @@ func (s *xlStorage) WriteMetadata(ctx context.Context, volume, path string, fi F
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
return err return err
} }
buf, err := xlMeta.AppendTo(nil) buf, err := xlMeta.AppendTo(metaDataPoolGet())
defer metaDataPoolPut(buf)
if err != nil { if err != nil {
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
return err return err
@ -986,6 +988,7 @@ func (s *xlStorage) WriteMetadata(ctx context.Context, volume, path string, fi F
if err != nil && err != errFileNotFound { if err != nil && err != errFileNotFound {
return err return err
} }
defer metaDataPoolPut(buf)
var xlMeta xlMetaV2 var xlMeta xlMetaV2
if !isXL2V1Format(buf) { if !isXL2V1Format(buf) {
@ -995,7 +998,8 @@ func (s *xlStorage) WriteMetadata(ctx context.Context, volume, path string, fi F
return err return err
} }
buf, err = xlMeta.AppendTo(nil) buf, err = xlMeta.AppendTo(metaDataPoolGet())
defer metaDataPoolPut(buf)
if err != nil { if err != nil {
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
return err return err
@ -1011,7 +1015,8 @@ func (s *xlStorage) WriteMetadata(ctx context.Context, volume, path string, fi F
return err return err
} }
buf, err = xlMeta.AppendTo(nil) buf, err = xlMeta.AppendTo(metaDataPoolGet())
defer metaDataPoolPut(buf)
if err != nil { if err != nil {
logger.LogIf(ctx, err) logger.LogIf(ctx, err)
return err return err
@ -1132,11 +1137,9 @@ func (s *xlStorage) ReadVersion(ctx context.Context, volume, path, versionID str
return fi, err return fi, err
} }
if len(fi.Data) == 0 && cap(buf) >= metaDataReadDefault && cap(buf) < metaDataReadDefault*4 { if len(fi.Data) == 0 {
// We did not read inline data, so we have no references. // We did not read inline data, so we have no references.
defer func(b []byte) { defer metaDataPoolPut(buf)
metaDataPool.Put(buf)
}(buf)
} }
if readData { if readData {