Commit e15f67a1 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Remove the request_deadline feature flag

The feature has been enabled on GitLab.com for over 24h without
issue.

It hasn't had the impact we hoped it would, but it does improve the
situation. And the calculated deadline can be reused in other parts of
the application that should enforce this limit.
parent c70a8985
---
title: Don't allow Gitaly calls to exceed the worker timeout set for unicorn or puma
merge_request: 23510
author:
type: performance
...@@ -18,7 +18,6 @@ module Gitlab ...@@ -18,7 +18,6 @@ module Gitlab
def request_deadline def request_deadline
strong_memoize(:request_deadline) do strong_memoize(:request_deadline) do
next unless request_start_time next unless request_start_time
next unless Feature.enabled?(:request_deadline)
request_start_time + max_request_duration_seconds request_start_time + max_request_duration_seconds
end end
......
...@@ -24,18 +24,6 @@ describe Gitlab::RequestContext, :request_store do ...@@ -24,18 +24,6 @@ describe Gitlab::RequestContext, :request_store do
expect(subject.request_deadline).to be_nil expect(subject.request_deadline).to be_nil
end end
it 'only checks the feature once per request-instance' do
expect(Feature).to receive(:enabled?).with(:request_deadline).once
2.times { subject.request_deadline }
end
it 'returns nil when the feature is disabled' do
stub_feature_flags(request_deadline: false)
expect(subject.request_deadline).to be_nil
end
end end
describe '#ensure_request_deadline_not_exceeded!' do describe '#ensure_request_deadline_not_exceeded!' do
......
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