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
2d3a3323
Commit
2d3a3323
authored
May 31, 2021
by
Jose Vargas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove ci-trace-read-consistency feature flag
Changelog: changed
parent
deea032d
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
4 additions
and
23 deletions
+4
-23
app/models/ci/build_trace_chunk.rb
app/models/ci/build_trace_chunk.rb
+0
-6
config/feature_flags/development/gitlab_ci_trace_read_consistency.yml
...re_flags/development/gitlab_ci_trace_read_consistency.yml
+0
-8
lib/gitlab/ci/trace/chunked_io.rb
lib/gitlab/ci/trace/chunked_io.rb
+2
-7
spec/lib/gitlab/ci/trace/chunked_io_spec.rb
spec/lib/gitlab/ci/trace/chunked_io_spec.rb
+1
-1
spec/models/ci/build_trace_chunk_spec.rb
spec/models/ci/build_trace_chunk_spec.rb
+1
-1
No files found.
app/models/ci/build_trace_chunk.rb
View file @
2d3a3323
...
...
@@ -85,16 +85,10 @@ module Ci
# change the behavior in CE.
#
def
with_read_consistency
(
build
,
&
block
)
return
yield
unless
consistent_reads_enabled?
(
build
)
::
Gitlab
::
Database
::
Consistency
.
with_read_consistency
(
&
block
)
end
def
consistent_reads_enabled?
(
build
)
Feature
.
enabled?
(
:gitlab_ci_trace_read_consistency
,
build
.
project
,
type: :development
,
default_enabled:
true
)
end
##
# Sometimes we do not want to read raw data. This method makes it easier
# to find attributes that are just metadata excluding raw data.
...
...
config/feature_flags/development/gitlab_ci_trace_read_consistency.yml
deleted
100644 → 0
View file @
deea032d
---
name
:
gitlab_ci_trace_read_consistency
introduced_by_url
:
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/46976
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/320938
milestone
:
'
13.9'
type
:
development
group
:
group::continuous integration
default_enabled
:
true
lib/gitlab/ci/trace/chunked_io.rb
View file @
2d3a3323
...
...
@@ -229,13 +229,8 @@ module Gitlab
def
next_chunk
@chunks_cache
[
chunk_index
]
=
begin
if
::
Ci
::
BuildTraceChunk
.
consistent_reads_enabled?
(
build
)
::
Ci
::
BuildTraceChunk
.
safe_find_or_create_by
(
build:
build
,
chunk_index:
chunk_index
)
else
::
Ci
::
BuildTraceChunk
.
new
(
build:
build
,
chunk_index:
chunk_index
)
end
end
end
...
...
spec/lib/gitlab/ci/trace/chunked_io_spec.rb
View file @
2d3a3323
...
...
@@ -10,7 +10,7 @@ RSpec.describe Gitlab::Ci::Trace::ChunkedIO, :clean_gitlab_redis_cache do
let
(
:chunked_io
)
{
described_class
.
new
(
build
)
}
before
do
stub_feature_flags
(
ci_enable_live_trace:
true
,
gitlab_ci_trace_read_consistency:
true
)
stub_feature_flags
(
ci_enable_live_trace:
true
)
end
describe
"#initialize"
do
...
...
spec/models/ci/build_trace_chunk_spec.rb
View file @
2d3a3323
...
...
@@ -18,7 +18,7 @@ RSpec.describe Ci::BuildTraceChunk, :clean_gitlab_redis_shared_state do
it_behaves_like
'having unique enum values'
before
do
stub_feature_flags
(
ci_enable_live_trace:
true
,
gitlab_ci_trace_read_consistency:
true
)
stub_feature_flags
(
ci_enable_live_trace:
true
)
stub_artifacts_object_storage
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