github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes in resource gathering to help debugging

Browse Source
This commit is contained in:
gmarek
2016-02-22 16:42:37 +01:00
parent c533ae4dd0
commit 20e15cb6af
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/resource_usage_gatherer.go
View File

@@ -30,6 +30,7 @@ import (
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
client "k8s.io/kubernetes/pkg/client/unversioned" client "k8s.io/kubernetes/pkg/client/unversioned"
utilruntime "k8s.io/kubernetes/pkg/util/runtime"
) )
const ( const (
@@ -44,7 +45,6 @@ type resourceConstraint struct {
type containerResourceGatherer struct { type containerResourceGatherer struct {
usageTimeseries map[time.Time]resourceUsagePerContainer usageTimeseries map[time.Time]resourceUsagePerContainer
stopCh chan struct{} stopCh chan struct{}
timer *time.Ticker
wg sync.WaitGroup wg sync.WaitGroup
} }
@@ -79,11 +79,12 @@ func (g *containerResourceGatherer) startGatheringData(c *client.Client, period
g.usageTimeseries = make(map[time.Time]resourceUsagePerContainer) g.usageTimeseries = make(map[time.Time]resourceUsagePerContainer)
g.wg.Add(1) g.wg.Add(1)
g.stopCh = make(chan struct{}) g.stopCh = make(chan struct{})
g.timer = time.NewTicker(period)
go func() error { go func() error {
defer utilruntime.HandleCrash()
defer g.wg.Done()
for { for {
select { select {
case <-g.timer.C: case <-time.After(period):
now := time.Now() now := time.Now()
data, err := g.getKubeSystemContainersResourceUsage(c) data, err := g.getKubeSystemContainersResourceUsage(c)
if err != nil { if err != nil {
@@ -93,7 +94,6 @@ func (g *containerResourceGatherer) startGatheringData(c *client.Client, period
g.usageTimeseries[now] = data g.usageTimeseries[now] = data
case <-g.stopCh: case <-g.stopCh:
Logf("Stop channel is closed. Stopping gatherer.") Logf("Stop channel is closed. Stopping gatherer.")
g.wg.Done()
return nil return nil
} }
} }
@@ -226,6 +226,7 @@ func (g *containerResourceGatherer) getKubeSystemContainersResourceUsage(c *clie
nameToUsageMap := make(resourceUsagePerContainer, len(containerIDToNameMap)) nameToUsageMap := make(resourceUsagePerContainer, len(containerIDToNameMap))
for _, node := range nodes.Items { for _, node := range nodes.Items {
go func(nodeName string) { go func(nodeName string) {
defer utilruntime.HandleCrash()
defer wg.Done() defer wg.Done()
nodeUsage, err := getOneTimeResourceUsageOnNode(c, nodeName, 15*time.Second, func() []string { return containerIDs }, true) nodeUsage, err := getOneTimeResourceUsageOnNode(c, nodeName, 15*time.Second, func() []string { return containerIDs }, true)
mutex.Lock() mutex.Lock()