Commit 6a88498b authored by Douwe Maan's avatar Douwe Maan

Merge branch 'net-read-timeout' into 'master'

Increase HTTP timeout and log request durations

On some GitLab deployments internal API calls regularly take more than
60 seconds (the default HTTP read timeout of Ruby's Net::HTTP). Until
we understand the cause of this slowness, by raising the client
timeout in gitlab-shell we can at least spare end users having to
retry their `git pull` or `git push`.

See merge request !37
parents bb43a85d b963018e
...@@ -17,6 +17,7 @@ gitlab_url: "http://localhost:8080" ...@@ -17,6 +17,7 @@ gitlab_url: "http://localhost:8080"
# See installation.md#using-https for additional HTTPS configuration details. # See installation.md#using-https for additional HTTPS configuration details.
http_settings: http_settings:
# read_timeout: 300
# user: someone # user: someone
# password: somepass # password: somepass
# ca_file: /etc/ssl/cert.pem # ca_file: /etc/ssl/cert.pem
......
...@@ -10,6 +10,9 @@ require_relative 'httpunix' ...@@ -10,6 +10,9 @@ require_relative 'httpunix'
class GitlabNet class GitlabNet
class ApiUnreachableError < StandardError; end class ApiUnreachableError < StandardError; end
CHECK_TIMEOUT = 5
READ_TIMEOUT = 300
def check_access(cmd, repo, actor, changes) def check_access(cmd, repo, actor, changes)
project_name = repo.gsub("'", "") project_name = repo.gsub("'", "")
project_name = project_name.gsub(/\.git\Z/, "") project_name = project_name.gsub(/\.git\Z/, "")
...@@ -50,7 +53,7 @@ class GitlabNet ...@@ -50,7 +53,7 @@ class GitlabNet
end end
def check def check
get("#{host}/check") get("#{host}/check", read_timeout: CHECK_TIMEOUT)
end end
protected protected
...@@ -63,13 +66,15 @@ class GitlabNet ...@@ -63,13 +66,15 @@ class GitlabNet
"#{config.gitlab_url}/api/v3/internal" "#{config.gitlab_url}/api/v3/internal"
end end
def http_client_for(uri) def http_client_for(uri, options={})
if uri.is_a?(URI::HTTPUNIX) if uri.is_a?(URI::HTTPUNIX)
http = Net::HTTPUNIX.new(uri.hostname) http = Net::HTTPUNIX.new(uri.hostname)
else else
http = Net::HTTP.new(uri.host, uri.port) http = Net::HTTP.new(uri.host, uri.port)
end end
http.read_timeout = options[:read_timeout] || read_timeout
if uri.is_a?(URI::HTTPS) if uri.is_a?(URI::HTTPS)
http.use_ssl = true http.use_ssl = true
http.cert_store = cert_store http.cert_store = cert_store
...@@ -92,19 +97,24 @@ class GitlabNet ...@@ -92,19 +97,24 @@ class GitlabNet
request request
end end
def request(method, url, params = {}) def request(method, url, params = {}, options={})
$logger.debug "Performing #{method.to_s.upcase} #{url}" $logger.debug "Performing #{method.to_s.upcase} #{url}"
uri = URI.parse(url) uri = URI.parse(url)
http = http_client_for(uri) http = http_client_for(uri, options)
request = http_request_for(method, uri, params) request = http_request_for(method, uri, params)
begin begin
start_time = Time.new
response = http.start { http.request(request) } response = http.start { http.request(request) }
rescue => e rescue => e
$logger.warn "Failed to connect to internal API <#{method.to_s.upcase} #{url}>: #{e.inspect}" $logger.warn "Failed to connect to internal API <#{method.to_s.upcase} #{url}>: #{e.inspect}"
raise ApiUnreachableError raise ApiUnreachableError
ensure
$logger.info do
sprintf('%s %s %0.5f', method.to_s.upcase, url, Time.new - start_time)
end
end end
if response.code == "200" if response.code == "200"
...@@ -116,8 +126,8 @@ class GitlabNet ...@@ -116,8 +126,8 @@ class GitlabNet
response response
end end
def get(url) def get(url, options={})
request(:get, url) request(:get, url, {}, options)
end end
def post(url, params) def post(url, params)
...@@ -144,4 +154,8 @@ class GitlabNet ...@@ -144,4 +154,8 @@ class GitlabNet
def secret_token def secret_token
@secret_token ||= File.read config.secret_file @secret_token ||= File.read config.secret_file
end end
def read_timeout
config.http_settings['read_timeout'] || READ_TIMEOUT
end
end end
...@@ -143,7 +143,7 @@ describe GitlabNet, vcr: true do ...@@ -143,7 +143,7 @@ describe GitlabNet, vcr: true do
subject { gitlab_net.send :http_client_for, URI('https://localhost/') } subject { gitlab_net.send :http_client_for, URI('https://localhost/') }
before do before do
gitlab_net.stub! :cert_store gitlab_net.stub! :cert_store
gitlab_net.send(:config).http_settings.stub(:[]).with('self_signed_cert') { true } gitlab_net.send(:config).stub(:http_settings) { {'self_signed_cert' => true} }
end end
its(:verify_mode) { should eq(OpenSSL::SSL::VERIFY_NONE) } its(:verify_mode) { should eq(OpenSSL::SSL::VERIFY_NONE) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment