From e2845376be1ec0f34747d8f0d725b1000b460132 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 19 May 2015 16:23:46 -0500 Subject: [PATCH] Increase repo url availability timeout values In order to improve the experiance when deploying nodes on slow or congested network links, we need to increase the values of the timeouts for our url availability check. We are increasing them from 5 seconds for the open and read timeouts to 60 seconds. Additionally we are increasing the overall timeout on the check to 180 seconds. We are also increasing the task timeout from 600 seconds to 3600 seconds. Change-Id: Ibd4e87fbf3a27d1fca1bcad39ee9f534c9a92f60 Closes-Bug: 1456805 Related-Bug: 1261940 --- .../lib/puppet/parser/functions/url_available.rb | 6 +++--- .../puppet/osnailyfacter/modular/netconfig/tasks.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/url_available.rb b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/url_available.rb index 7b71957298..c337f09110 100644 --- a/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/url_available.rb +++ b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/url_available.rb @@ -36,11 +36,11 @@ function. Must be of type String or Hash." end puts "Checking #{uri}" begin - out = Timeout::timeout(15) do + out = Timeout::timeout(180) do u = URI.parse(uri) http = Net::HTTP.new(u.host, u.port) - http.open_timeout = 5 - http.read_timeout = 5 + http.open_timeout = 60 + http.read_timeout = 60 request = Net::HTTP::Get.new(u.request_uri) response = http.request(request) end diff --git a/deployment/puppet/osnailyfacter/modular/netconfig/tasks.yaml b/deployment/puppet/osnailyfacter/modular/netconfig/tasks.yaml index edb0ac8864..5c96dc3415 100644 --- a/deployment/puppet/osnailyfacter/modular/netconfig/tasks.yaml +++ b/deployment/puppet/osnailyfacter/modular/netconfig/tasks.yaml @@ -20,5 +20,5 @@ parameters: puppet_manifest: /etc/puppet/modules/osnailyfacter/modular/netconfig/connectivity_tests.pp puppet_modules: /etc/puppet/modules - timeout: 600 + timeout: 3600 cwd: /