Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
781c856e
Commit
781c856e
authored
Mar 29, 2021
by
Fabio Pitino
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ci_lower_frequency_trace_update feature flag
Turn the 60s trace interval update the default behavior.
parent
8c37c23f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
6 additions
and
35 deletions
+6
-35
changelogs/unreleased/fp-remove-ff-ci-lower-frequency-trace-update.yml
...released/fp-remove-ff-ci-lower-frequency-trace-update.yml
+5
-0
config/feature_flags/development/ci_lower_frequency_trace_update.yml
...ure_flags/development/ci_lower_frequency_trace_update.yml
+0
-8
lib/gitlab/ci/trace.rb
lib/gitlab/ci/trace.rb
+1
-6
spec/lib/gitlab/ci/trace_spec.rb
spec/lib/gitlab/ci/trace_spec.rb
+0
-8
spec/requests/api/ci/runner/jobs_trace_spec.rb
spec/requests/api/ci/runner/jobs_trace_spec.rb
+0
-13
No files found.
changelogs/unreleased/fp-remove-ff-ci-lower-frequency-trace-update.yml
0 → 100644
View file @
781c856e
---
title
:
Remove ci_lower_frequency_trace_update feature flag
merge_request
:
57713
author
:
type
:
performance
config/feature_flags/development/ci_lower_frequency_trace_update.yml
deleted
100644 → 0
View file @
8c37c23f
---
name
:
ci_lower_frequency_trace_update
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/56743
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/324768
milestone
:
'
13.11'
type
:
development
group
:
group::continuous integration
default_enabled
:
false
lib/gitlab/ci/trace.rb
View file @
781c856e
...
...
@@ -11,7 +11,6 @@ module Gitlab
LOCK_SLEEP
=
0.001
.
seconds
WATCH_FLAG_TTL
=
10
.
seconds
LEGACY_UPDATE_FREQUENCY_DEFAULT
=
30
.
seconds
UPDATE_FREQUENCY_DEFAULT
=
60
.
seconds
UPDATE_FREQUENCY_WHEN_BEING_WATCHED
=
3
.
seconds
...
...
@@ -118,11 +117,7 @@ module Gitlab
if
being_watched?
UPDATE_FREQUENCY_WHEN_BEING_WATCHED
else
if
Feature
.
enabled?
(
:ci_lower_frequency_trace_update
,
job
.
project
,
default_enabled: :yaml
)
UPDATE_FREQUENCY_DEFAULT
else
LEGACY_UPDATE_FREQUENCY_DEFAULT
end
UPDATE_FREQUENCY_DEFAULT
end
end
...
...
spec/lib/gitlab/ci/trace_spec.rb
View file @
781c856e
...
...
@@ -64,14 +64,6 @@ RSpec.describe Gitlab::Ci::Trace, :clean_gitlab_redis_shared_state, factory_defa
describe
'#update_interval'
do
context
'it is not being watched'
do
it
{
expect
(
trace
.
update_interval
).
to
eq
(
60
.
seconds
)
}
context
'when feature flag ci_lower_frequency_trace_update is disabled'
do
before
do
stub_feature_flags
(
ci_lower_frequency_trace_update:
false
)
end
it
{
expect
(
trace
.
update_interval
).
to
eq
(
30
.
seconds
)
}
end
end
context
'it is being watched'
do
...
...
spec/requests/api/ci/runner/jobs_trace_spec.rb
View file @
781c856e
...
...
@@ -216,19 +216,6 @@ RSpec.describe API::Ci::Runner, :clean_gitlab_redis_shared_state do
expect
(
response
).
to
have_gitlab_http_status
(
:accepted
)
expect
(
response
.
header
[
'X-GitLab-Trace-Update-Interval'
]).
to
eq
(
'60'
)
end
context
'when ci_lower_frequency_trace_update feature flag is disabled'
do
before
do
stub_feature_flags
(
ci_lower_frequency_trace_update:
false
)
end
it
'returns the legacy interval in X-GitLab-Trace-Update-Interval'
do
patch_the_trace
expect
(
response
).
to
have_gitlab_http_status
(
:accepted
)
expect
(
response
.
header
[
'X-GitLab-Trace-Update-Interval'
]).
to
eq
(
'30'
)
end
end
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment