kubernetes-sigs/prometheus-adapter
1
0
Fork 1
mirror of https://github.com/kubernetes-sigs/prometheus-adapter.git synced 2026-04-07 02:07:58 +00:00
Code Issues Projects Releases Packages Activity Actions

Fix asynchronous calls to map

Browse source
This commit is contained in:
Joel Speed 2018-04-18 11:34:50 +01:00
parent c89994104d
commit 44d755ae38
No known key found for this signature in database
GPG key ID: 83695B8B3A376982
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pkg/custom-provider/provider.go
View file

@ -19,9 +19,11 @@ package provider
import ( import (
"context" "context"
"fmt" "fmt"
"github.com/golang/glog" "sync"
"time" "time"
"github.com/golang/glog"
"github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider" "github.com/kubernetes-incubator/custom-metrics-apiserver/pkg/provider"
pmodel "github.com/prometheus/common/model" pmodel "github.com/prometheus/common/model"
apierr "k8s.io/apimachinery/pkg/api/errors" apierr "k8s.io/apimachinery/pkg/api/errors"
@ -287,6 +289,7 @@ func (l *cachingMetricsLister) updateMetrics() error {
// don't do duplicate queries when it's just the matchers that change // don't do duplicate queries when it's just the matchers that change
seriesCacheByQuery := make(map[prom.Selector][]prom.Series) seriesCacheByQuery := make(map[prom.Selector][]prom.Series)
seriesCacheByQueryLock := sync.RWMutex{}
// these can take a while on large clusters, so launch in parallel // these can take a while on large clusters, so launch in parallel
// and don't duplicate // and don't duplicate
@ -298,7 +301,9 @@ func (l *cachingMetricsLister) updateMetrics() error {
errs <- nil errs <- nil
continue continue
} }
seriesCacheByQueryLock.Lock()
selectors[sel] = struct{}{} selectors[sel] = struct{}{}
seriesCacheByQueryLock.Unlock()
go func() { go func() {
series, err := l.promClient.Series(context.TODO(), pmodel.Interval{startTime, 0}, sel) series, err := l.promClient.Series(context.TODO(), pmodel.Interval{startTime, 0}, sel)
if err != nil { if err != nil {
@ -306,7 +311,9 @@ func (l *cachingMetricsLister) updateMetrics() error {
return return
} }
errs <- nil errs <- nil
seriesCacheByQueryLock.Lock()
seriesCacheByQuery[sel] = series seriesCacheByQuery[sel] = series
seriesCacheByQueryLock.Unlock()
}() }()
} }