From f8ea4ad16d51f6f062be2c250be26d731b92bd3c Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Fri, 16 Oct 2015 15:34:35 -0700 Subject: [PATCH] Increase ping timeout Ensure v2 registries are given more than 5 seconds to return a ping and avoid an unnecessary fallback to v1. Elevates log level about failed v2 ping to a warning to match the warning related to using v1 registries. Signed-off-by: Derek McGowan (github: dmcgowan) --- graph/pull_v2.go | 2 +- graph/registry.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/graph/pull_v2.go b/graph/pull_v2.go index 808f44575f..680c2434f6 100644 --- a/graph/pull_v2.go +++ b/graph/pull_v2.go @@ -37,7 +37,7 @@ func (p *v2Puller) Pull(tag string) (fallback bool, err error) { // TODO(tiborvass): was ReceiveTimeout p.repo, err = NewV2Repository(p.repoInfo, p.endpoint, p.config.MetaHeaders, p.config.AuthConfig, "pull") if err != nil { - logrus.Debugf("Error getting v2 registry: %v", err) + logrus.Warnf("Error getting v2 registry: %v", err) return true, err } diff --git a/graph/registry.go b/graph/registry.go index cb5eb01d84..599a807c55 100644 --- a/graph/registry.go +++ b/graph/registry.go @@ -57,7 +57,7 @@ func NewV2Repository(repoInfo *registry.RepositoryInfo, endpoint registry.APIEnd authTransport := transport.NewTransport(base, modifiers...) pingClient := &http.Client{ Transport: authTransport, - Timeout: 5 * time.Second, + Timeout: 15 * time.Second, } endpointStr := endpoint.URL + "/v2/" req, err := http.NewRequest("GET", endpointStr, nil)