diff options
author | Claire McQuin <mcquin@users.noreply.github.com> | 2014-10-02 10:15:39 -0700 |
---|---|---|
committer | Serdar Sutay <serdar@opscode.com> | 2014-10-02 12:24:15 -0700 |
commit | 99b99c0de65c715f64da77ecbd1d24b57d74c1ec (patch) | |
tree | bf856bd78eb12b7efccb83166425e07852daab8d /lib | |
parent | 75718f7fbeea2dca37112b9e34d4d6f8a98ebefe (diff) | |
download | chef-99b99c0de65c715f64da77ecbd1d24b57d74c1ec.tar.gz |
Merge pull request #1912 from jessehu/CHEF-ISSUE-1904sersut/backport-chef-1912
retry on HTTP 50X Error when calling Chef REST API
Diffstat (limited to 'lib')
-rw-r--r-- | lib/chef/http.rb | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/lib/chef/http.rb b/lib/chef/http.rb index abc47f636e..7f2d00157b 100644 --- a/lib/chef/http.rb +++ b/lib/chef/http.rb @@ -289,11 +289,26 @@ class Chef def retrying_http_errors(url) http_attempts = 0 begin - http_attempts += 1 - - yield - + loop do + http_attempts += 1 + response, request, return_value = yield + # handle HTTP 50X Error + if response.kind_of?(Net::HTTPServerError) + if http_retry_count - http_attempts + 1 > 0 + sleep_time = 1 + (2 ** http_attempts) + rand(2 ** http_attempts) + Chef::Log.error("Server returned error #{response.code} for #{url}, retrying #{http_attempts}/#{http_retry_count} in #{sleep_time}s") + sleep(sleep_time) + redo + end + end + return [response, request, return_value] + end rescue SocketError, Errno::ETIMEDOUT => e + if http_retry_count - http_attempts + 1 > 0 + Chef::Log.error("Error connecting to #{url}, retry #{http_attempts}/#{http_retry_count}") + sleep(http_retry_delay) + retry + end e.message.replace "Error connecting to #{url} - #{e.message}" raise e rescue Errno::ECONNREFUSED @@ -310,14 +325,6 @@ class Chef retry end raise Timeout::Error, "Timeout connecting to #{url}, giving up" - rescue Net::HTTPFatalError => e - if http_retry_count - http_attempts + 1 > 0 - sleep_time = 1 + (2 ** http_attempts) + rand(2 ** http_attempts) - Chef::Log.error("Server returned error for #{url}, retrying #{http_attempts}/#{http_retry_count} in #{sleep_time}s") - sleep(sleep_time) - retry - end - raise end end |