github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #22510 from gmarek/proxy

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-03-04 02:29:37 -08:00
commit 1b9abdc920
1 changed files with 31 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
test/e2e/kubelet_stats.go
View File

@ -42,6 +42,11 @@ import (
"k8s.io/kubernetes/pkg/util/wait" "k8s.io/kubernetes/pkg/util/wait"
) )
const (
// timeout for proxy requests.
proxyTimeout = 2 * time.Minute
)
// KubeletMetric stores metrics scraped from the kubelet server's /metric endpoint. // KubeletMetric stores metrics scraped from the kubelet server's /metric endpoint.
// TODO: Get some more structure around the metrics and this type // TODO: Get some more structure around the metrics and this type
type KubeletMetric struct { type KubeletMetric struct {
@ -339,28 +344,39 @@ type usageDataPerContainer struct {
// Performs a get on a node proxy endpoint given the nodename and rest client. // Performs a get on a node proxy endpoint given the nodename and rest client.
func nodeProxyRequest(c *client.Client, node, endpoint string) (restclient.Result, error) { func nodeProxyRequest(c *client.Client, node, endpoint string) (restclient.Result, error) {
// proxy tends to hang in some cases when Node is not ready. Add an artificial timeout for this call.
// This will leak a goroutine if proxy hangs. #22165
subResourceProxyAvailable, err := serverVersionGTE(subResourceServiceAndNodeProxyVersion, c) subResourceProxyAvailable, err := serverVersionGTE(subResourceServiceAndNodeProxyVersion, c)
if err != nil { if err != nil {
return restclient.Result{}, err return restclient.Result{}, err
} }
var result restclient.Result var result restclient.Result
if subResourceProxyAvailable { finished := make(chan struct{})
result = c.Get(). go func() {
Resource("nodes"). if subResourceProxyAvailable {
SubResource("proxy"). result = c.Get().
Name(fmt.Sprintf("%v:%v", node, ports.KubeletPort)). Resource("nodes").
Suffix(endpoint). SubResource("proxy").
Do() Name(fmt.Sprintf("%v:%v", node, ports.KubeletPort)).
Suffix(endpoint).
Do()
} else { } else {
result = c.Get(). result = c.Get().
Prefix("proxy"). Prefix("proxy").
Resource("nodes"). Resource("nodes").
Name(fmt.Sprintf("%v:%v", node, ports.KubeletPort)). Name(fmt.Sprintf("%v:%v", node, ports.KubeletPort)).
Suffix(endpoint). Suffix(endpoint).
Do() Do()
}
finished <- struct{}{}
}()
select {
case <-finished:
return result, nil
case <-time.After(proxyTimeout):
return restclient.Result{}, nil
} }
return result, nil
} }
// Retrieve metrics from the kubelet server of the given node. // Retrieve metrics from the kubelet server of the given node.