mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2025-03-05 20:59:13 -08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #282 from codesome/goroutine-stack-overflow

Browse source 
Change recursion into iteration for removedPostings.Next()
This commit is contained in:
Fabian Reinartz 2018-02-15 12:20:47 +01:00 committed by GitHub
parent bc49a665d1 0fb73ed622
commit cc673dc167
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
index/postings.go
View file

@ -445,7 +445,7 @@ func (rp *removedPostings) Next() bool {
rp.rok = rp.remove.Next() rp.rok = rp.remove.Next()
rp.initialized = true rp.initialized = true
} }
for {
if !rp.fok { if !rp.fok {
return false return false
} }
@ -469,8 +469,7 @@ func (rp *removedPostings) Next() bool {
// Skip the current posting. // Skip the current posting.
rp.fok = rp.full.Next() rp.fok = rp.full.Next()
} }
}
return rp.Next()
} }
func (rp *removedPostings) Seek(id uint64) bool { func (rp *removedPostings) Seek(id uint64) bool {

22
index/postings_test.go
View file

@ -354,6 +354,28 @@ func TestRemovedPostings(t *testing.T) {
} }
func TestRemovedNextStackoverflow(t *testing.T) {
var full []uint64
var remove []uint64
var i uint64
for i = 0; i < 1e7; i++ {
full = append(full, i)
remove = append(remove, i)
}
flp := newListPostings(full)
rlp := newListPostings(remove)
rp := newRemovedPostings(flp, rlp)
gotElem := false
for rp.Next() {
gotElem = true
}
testutil.Ok(t, rp.Err())
testutil.Assert(t, !gotElem, "")
}
func TestRemovedPostingsSeek(t *testing.T) { func TestRemovedPostingsSeek(t *testing.T) {
var cases = []struct { var cases = []struct {
a, b []uint64 a, b []uint64