Commit cb4e5cd3 authored by Nick Thomas's avatar Nick Thomas

Merge branch 'bvl-remove-request-deadline-ff' into 'master'

Remove the request_deadline feature flag

See merge request gitlab-org/gitlab!23510
parents 6b4cdad7 e15f67a1
---
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
def request_deadline
strong_memoize(:request_deadline) do
next unless request_start_time
next unless Feature.enabled?(:request_deadline)
request_start_time + max_request_duration_seconds
end
......
......@@ -24,18 +24,6 @@ describe Gitlab::RequestContext, :request_store do
expect(subject.request_deadline).to be_nil
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
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