Commit 3a5fbca5 authored by Max Woolf's avatar Max Woolf

Merge branch 'ci-remove-log-size-limit-feature-flag' into 'master'

Remove ci_jobs_trace_size_limit feature flag

See merge request gitlab-org/gitlab!67770
parents 99c14063 99468602
...@@ -71,8 +71,7 @@ module Ci ...@@ -71,8 +71,7 @@ module Ci
end end
def trace_size_exceeded?(size) def trace_size_exceeded?(size)
Feature.enabled?(:ci_jobs_trace_size_limit, project, default_enabled: :yaml) && project.actual_limits.exceeded?(:ci_jobs_trace_size_limit, size / 1.megabyte)
project.actual_limits.exceeded?(:ci_jobs_trace_size_limit, size / 1.megabyte)
end end
end end
end end
---
name: ci_jobs_trace_size_limit
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65349
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/335259
milestone: '14.1'
type: development
group: group::pipeline execution
default_enabled: false
...@@ -499,15 +499,8 @@ A runner's registration fails if it exceeds the limit for the scope determined b ...@@ -499,15 +499,8 @@ A runner's registration fails if it exceeds the limit for the scope determined b
### Maximum file size for job logs ### Maximum file size for job logs
> - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/276192) in GitLab 14.1. > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/276192) in GitLab 14.1, disabled by default.
> - [Deployed behind a feature flag](../user/feature_flags.md), disabled by default. > - Enabled by default and [feature flag `ci_jobs_trace_size_limit` removed](https://gitlab.com/gitlab-org/gitlab/-/issues/335259) in GitLab 14.2.
> - Disabled on GitLab.com.
> - Not recommended for production use.
> - To use in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-job-log-limits). **(FREE SELF)**
This in-development feature might not be available for your use. There can be
[risks when enabling features still in development](../administration/feature_flags.md#risks-when-enabling-features-still-in-development).
Refer to this feature's version history for more details.
The job log file size limit is 100 megabytes by default. Any job that exceeds this value is dropped. The job log file size limit is 100 megabytes by default. Any job that exceeds this value is dropped.
...@@ -518,25 +511,6 @@ Update `ci_jobs_trace_size_limit` with the new value in megabytes: ...@@ -518,25 +511,6 @@ Update `ci_jobs_trace_size_limit` with the new value in megabytes:
Plan.default.actual_limits.update!(ci_jobs_trace_size_limit: 125) Plan.default.actual_limits.update!(ci_jobs_trace_size_limit: 125)
``` ```
#### Enable or disable job log limits **(FREE SELF)**
This feature is under development and not ready for production use. It is
deployed behind a feature flag that is **disabled by default**.
[GitLab administrators with access to the GitLab Rails console](feature_flags.md)
can enable it.
To enable it:
```ruby
Feature.enable(:ci_jobs_trace_size_limit)
```
To disable it:
```ruby
Feature.disable(:ci_jobs_trace_size_limit)
```
## Instance monitoring and metrics ## Instance monitoring and metrics
### Incident Management inbound alert limits ### Incident Management inbound alert limits
......
...@@ -75,25 +75,5 @@ RSpec.describe Ci::AppendBuildTraceService do ...@@ -75,25 +75,5 @@ RSpec.describe Ci::AppendBuildTraceService do
expect(build.reload).to be_failed expect(build.reload).to be_failed
expect(build.failure_reason).to eq 'trace_size_exceeded' expect(build.failure_reason).to eq 'trace_size_exceeded'
end end
context 'when the feature flag is disabled' do
before do
stub_feature_flags(ci_jobs_trace_size_limit: false)
end
it 'appends trace chunks' do
stream_size = 1.25.megabytes
body_data = 'x' * stream_size
content_range = "0-#{stream_size}"
result = described_class
.new(build, content_range: content_range)
.execute(body_data)
expect(result.status).to eq 202
expect(result.stream_size).to eq stream_size
expect(build.trace_chunks.count).to eq 10
end
end
end end
end end
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