diff options
author | Hui Hu <huh@vmware.com> | 2014-08-25 13:52:04 +0800 |
---|---|---|
committer | Hui Hu <huh@vmware.com> | 2014-08-25 13:52:04 +0800 |
commit | ace6c1e64fa32efcb9beeb8238edb1d71dab659d (patch) | |
tree | ef741e12d56dbee00996969b0c8d44923e2720dd | |
parent | 920d190cd817da50dcf87c3046b7c5f3bdcae7f9 (diff) | |
download | chef-ace6c1e64fa32efcb9beeb8238edb1d71dab659d.tar.gz |
retry on HTTP 50X Error when calling Chef REST API
-rw-r--r-- | lib/chef/http.rb | 31 | ||||
-rw-r--r-- | spec/unit/rest_spec.rb | 4 |
2 files changed, 22 insertions, 13 deletions
diff --git a/lib/chef/http.rb b/lib/chef/http.rb index abc47f636e..bdfd30f140 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 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 diff --git a/spec/unit/rest_spec.rb b/spec/unit/rest_spec.rb index f20672ef25..f82e4f5472 100644 --- a/spec/unit/rest_spec.rb +++ b/spec/unit/rest_spec.rb @@ -526,9 +526,11 @@ describe Chef::REST do http_response.stub(:read_body) http_response end - it "throws an exception" do + + it "retries 5 times and throws an exception" do rest.stub(:sleep) expect {rest.request(:GET, url)}.to raise_error(Net::HTTPFatalError) + expect(log_stringio.string).to match(Regexp.escape("ERROR: Server returned error for #{url}, retrying 5/5")) end end end |