Merge branch 'patch-11' into 'master'
doc/job_traces.md: the file is job.log See merge request gitlab-org/gitlab-ce!21360
This commit is contained in:
commit
ec9bb1a7de
1 changed files with 5 additions and 2 deletions
|
@ -12,8 +12,8 @@ In the following table you can see the phases a trace goes through.
|
|||
| ----- | ----- | --------- | --------- | ----------- |
|
||||
| 1: patching | Live trace | When a job is running | GitLab Runner => Unicorn => file storage |`#{ROOT_PATH}/builds/#{YYYY_mm}/#{project_id}/#{job_id}.log`|
|
||||
| 2: overwriting | Live trace | When a job is finished | GitLab Runner => Unicorn => file storage |`#{ROOT_PATH}/builds/#{YYYY_mm}/#{project_id}/#{job_id}.log`|
|
||||
| 3: archiving | Archived trace | After a job is finished | Sidekiq moves live trace to artifacts folder |`#{ROOT_PATH}/shared/artifacts/#{disk_hash}/#{YYYY_mm_dd}/#{job_id}/#{job_artifact_id}/trace.log`|
|
||||
| 4: uploading | Archived trace | After a trace is archived | Sidekiq moves archived trace to [object storage](#uploading-traces-to-object-storage) (if configured) |`#{bucket_name}/#{disk_hash}/#{YYYY_mm_dd}/#{job_id}/#{job_artifact_id}/trace.log`|
|
||||
| 3: archiving | Archived trace | After a job is finished | Sidekiq moves live trace to artifacts folder |`#{ROOT_PATH}/shared/artifacts/#{disk_hash}/#{YYYY_mm_dd}/#{job_id}/#{job_artifact_id}/job.log`|
|
||||
| 4: uploading | Archived trace | After a trace is archived | Sidekiq moves archived trace to [object storage](#uploading-traces-to-object-storage) (if configured) |`#{bucket_name}/#{disk_hash}/#{YYYY_mm_dd}/#{job_id}/#{job_artifact_id}/job.log`|
|
||||
|
||||
The `ROOT_PATH` varies per your environment. For Omnibus GitLab it
|
||||
would be `/var/opt/gitlab/gitlab-ci`, whereas for installations from source
|
||||
|
@ -88,6 +88,8 @@ To archive those legacy job traces, please follow the instruction below.
|
|||
|
||||
## How to migrate archived job traces to object storage
|
||||
|
||||
> [Introduced][ce-21193] in GitLab 11.3.
|
||||
|
||||
If job traces have already been archived into local storage, and you want to migrate those traces to object storage, please follow the instruction below.
|
||||
|
||||
1. Ensure [Object storage integration for Job Artifacts](job_artifacts.md#object-storage-settings) is enabled
|
||||
|
@ -201,4 +203,5 @@ indicate that we have trace chunk. `UPDATE`s with 128KB of data is issued once w
|
|||
receive multiple chunks.
|
||||
|
||||
[ce-18169]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18169
|
||||
[ce-21193]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/21193
|
||||
[ce-46097]: https://gitlab.com/gitlab-org/gitlab-ce/issues/46097
|
||||
|
|
Loading…
Reference in a new issue