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

Merge pull request #395 from dgrisonnet/panic-ms

Browse source 
Prevent metrics-server panics on GetContainerMetrics and GetNodeMetrics
This commit is contained in:
Kubernetes Prow Robot 2021-06-01 07:58:27 -07:00 • committed by GitHub
commit 215cb0c292
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
pkg/resourceprovider/provider.go
View file

@ -119,10 +119,13 @@ type nsQueryResults struct {
err error err error
} }
// GetPodMetrics implements the api.MetricsProvider interface. It may return nil, nil, nil. // GetPodMetrics implements the api.MetricsProvider interface.
func (p *resourceProvider) GetPodMetrics(pods ...apitypes.NamespacedName) ([]api.TimeInfo, [][]metrics.ContainerMetrics, error) { func (p *resourceProvider) GetPodMetrics(pods ...apitypes.NamespacedName) ([]api.TimeInfo, [][]metrics.ContainerMetrics, error) {
resTimes := make([]api.TimeInfo, len(pods))
resMetrics := make([][]metrics.ContainerMetrics, len(pods))
if len(pods) == 0 { if len(pods) == 0 {
return nil, nil, nil return resTimes, resMetrics, nil
} }
// TODO(directxman12): figure out how well this scales if we go to list 1000+ pods // TODO(directxman12): figure out how well this scales if we go to list 1000+ pods
@ -162,8 +165,6 @@ func (p *resourceProvider) GetPodMetrics(pods ...apitypes.NamespacedName) ([]api
// convert the unorganized per-container results into results grouped // convert the unorganized per-container results into results grouped
// together by namespace, pod, and container // together by namespace, pod, and container
resTimes := make([]api.TimeInfo, len(pods))
resMetrics := make([][]metrics.ContainerMetrics, len(pods))
for i, pod := range pods { for i, pod := range pods {
p.assignForPod(pod, resultsByNs, &resMetrics[i], &resTimes[i]) p.assignForPod(pod, resultsByNs, &resMetrics[i], &resTimes[i])
} }
@ -251,10 +252,13 @@ func (p *resourceProvider) assignForPod(pod apitypes.NamespacedName, resultsByNs
*resMetrics = containerMetricsList *resMetrics = containerMetricsList
} }
// GetNodeMetrics implements the api.MetricsProvider interface. It may return nil, nil. // GetNodeMetrics implements the api.MetricsProvider interface.
func (p *resourceProvider) GetNodeMetrics(nodes ...string) ([]api.TimeInfo, []corev1.ResourceList, error) { func (p *resourceProvider) GetNodeMetrics(nodes ...string) ([]api.TimeInfo, []corev1.ResourceList, error) {
resTimes := make([]api.TimeInfo, len(nodes))
resMetrics := make([]corev1.ResourceList, len(nodes))
if len(nodes) == 0 { if len(nodes) == 0 {
return nil, nil, nil return resTimes, resMetrics, nil
} }
now := pmodel.Now() now := pmodel.Now()
@ -263,12 +267,9 @@ func (p *resourceProvider) GetNodeMetrics(nodes ...string) ([]api.TimeInfo, []co
qRes := p.queryBoth(now, nodeResource, "", nodes...) qRes := p.queryBoth(now, nodeResource, "", nodes...)
if qRes.err != nil { if qRes.err != nil {
klog.Errorf("failed querying node metrics: %v", qRes.err) klog.Errorf("failed querying node metrics: %v", qRes.err)
return nil, nil, nil return resTimes, resMetrics, nil
} }
resTimes := make([]api.TimeInfo, len(nodes))
resMetrics := make([]corev1.ResourceList, len(nodes))
// organize the results // organize the results
for i, nodeName := range nodes { for i, nodeName := range nodes {
// skip if any data is missing // skip if any data is missing