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 5 Packages Projects Releases Wiki Activity

fix potential deadlock in test (#9010)

Browse source 
* fix potential deadlock

Signed-off-by: Shihao Xia <charlesxsh@hotmail.com>

* fix deadlock

Signed-off-by: Shihao Xia <charlesxsh@hotmail.com>

* Update promql/engine_test.go

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
Signed-off-by: Shihao Xia <charlesxsh@hotmail.com>

Co-authored-by: Ganesh Vernekar <15064823+codesome@users.noreply.github.com>
This commit is contained in:
Shihao Xia 2021-11-27 07:45:06 -05:00 committed by GitHub
parent e63b85be4f
commit 0e82a96e2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
promql/engine_test.go
View file

@ -58,10 +58,19 @@ func TestQueryConcurrency(t *testing.T) {
block := make(chan struct{}) block := make(chan struct{})
processing := make(chan struct{}) processing := make(chan struct{})
done := make(chan int)
defer close(done)
f := func(context.Context) error { f := func(context.Context) error {
processing <- struct{}{} select {
<-block case processing <- struct{}{}:
case <-done:
}
select {
case <-block:
case <-done:
}
return nil return nil
} }
@ -370,7 +379,6 @@ func TestSelectHintsSetCorrectly(t *testing.T) {
{Start: -45000, End: 80000, Func: "count_over_time"}, {Start: -45000, End: 80000, Func: "count_over_time"},
}, },
}, { }, {
query: "foo", start: 10000, end: 20000, query: "foo", start: 10000, end: 20000,
expected: []*storage.SelectHints{ expected: []*storage.SelectHints{
{Start: 5000, End: 20000, Step: 1000}, {Start: 5000, End: 20000, Step: 1000},