Merge pull request #25740 from gmarek/gatherer

Prevent division by 0 error in resource-gatherer

Merge pull request #25740 from gmarek/gatherer
9990f843 · Wojciech Tyczynski · 1738bbfe · 0848ad22 · 9990f843
Commit 9990f843 authored May 17, 2016 by Wojciech Tyczynski
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

resource_usage_gatherer.go test/e2e/framework/resource_usage_gatherer.go +3 -0

No files found.
--- a/test/e2e/framework/resource_usage_gatherer.go
+++ b/test/e2e/framework/resource_usage_gatherer.go
@@ -205,6 +205,9 @@ func getKubemarkMasterComponentsResourceUsage() ResourceUsagePerContainer {
 }

 func (g *containerResourceGatherer) getKubeSystemContainersResourceUsage(c *client.Client) {
+	if len(g.workers) == 0 {
+		return
+	}
 	delayPeriod := resourceDataGatheringPeriod / time.Duration(len(g.workers))
 	delay := time.Duration(0)
 	for i := range g.workers {