mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-09 23:24:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

exit early and panic for non slice on buffer.Put

Browse source
This commit is contained in:
Krasi Georgiev 2018-02-19 14:31:04 +02:00
parent f2c5913416
commit 9878d66484
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkg/pool/pool.go
View file

@ -71,16 +71,16 @@ func (p *Pool) Get(sz int) interface{} {
}
// Put adds a slice to the right bucket in the pool.
func (p *Pool) Put(s interface{}) error {
func (p *Pool) Put(s interface{}) {
slice := reflect.ValueOf(s)
if slice.Kind() == reflect.Slice {
for i, size := range p.sizes {
if slice.Cap() > size {
continue
}
p.buckets[i].Put(slice.Slice(0, 0).Interface())
return nil
}
if slice.Kind() != reflect.Slice {
panic(fmt.Sprintf("%+v is not a slice", slice))
}
for i, size := range p.sizes {
if slice.Cap() > size {
continue
}
p.buckets[i].Put(slice.Slice(0, 0).Interface())
}
return fmt.Errorf("%+v is not a slice", slice)
}

4
scrape/scrape.go
View file

@ -699,9 +699,7 @@ mainLoop:
}
}
if err := sl.buffers.Put(b); err != nil {
level.Error(sl.l).Log("msg", "buffer pool error", "err", err)
}
sl.buffers.Put(b)
if scrapeErr == nil {
scrapeErr = appErr