Merge pull request #20421 from thockin/e2e-debris

Remove e2e global 'timeout'
This commit is contained in:
Saad Ali 2016-02-03 16:38:02 -08:00
commit b2600a65f5
2 changed files with 1 additions and 2 deletions

View File

@ -27,7 +27,6 @@ import (
)
const (
timeout = 1 * time.Minute
maxRetries = 6
sleepDuration = 10 * time.Second
)

View File

@ -218,7 +218,7 @@ func availCpu(c *client.Client, node *api.Node) (int64, error) {
func availSize(c *client.Client, node *api.Node) (uint64, error) {
statsResource := fmt.Sprintf("api/v1/proxy/nodes/%s/stats/", node.Name)
Logf("Querying stats for node %s using url %s", node.Name, statsResource)
res, err := c.Get().AbsPath(statsResource).Timeout(timeout).Do().Raw()
res, err := c.Get().AbsPath(statsResource).Timeout(time.Minute).Do().Raw()
if err != nil {
return 0, fmt.Errorf("error querying cAdvisor API: %v", err)
}