diff options
| author | Rémy Coutable <remy@rymai.me> | 2018-09-04 13:41:07 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2018-09-04 13:41:07 +0000 |
| commit | ec9bb1a7deed082ef050a7275df0abd134f526f3 (patch) | |
| tree | 2f042f820fa0c94cf9c0cbb55c100bf347e3c287 | |
| parent | 3a4d3dff516a187923fa2442da88b44915a9c97c (diff) | |
| parent | c2307c3ae38087788b670fc4cf9f8ac30b0a131e (diff) | |
| download | gitlab-ce-ec9bb1a7deed082ef050a7275df0abd134f526f3.tar.gz | |
Merge branch 'patch-11' into 'master'
doc/job_traces.md: the file is job.log
See merge request gitlab-org/gitlab-ce!21360
| -rw-r--r-- | doc/administration/job_traces.md | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/doc/administration/job_traces.md b/doc/administration/job_traces.md index 6e2f67f61bc..a792a5f2a97 100644 --- a/doc/administration/job_traces.md +++ b/doc/administration/job_traces.md @@ -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 |