summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShinya Maeda <shinya@gitlab.com>2018-07-03 13:31:32 +0900
committerShinya Maeda <shinya@gitlab.com>2018-07-03 13:31:32 +0900
commit86251e74c54e837b1447deba6c53306c2a38c17d (patch)
treed7261752e21e94aac7c4acbb477c90d219d1553a
parentf930e94363e00e41fceb31f7d8497e5fb530dacd (diff)
downloadgitlab-ce-86251e74c54e837b1447deba6c53306c2a38c17d.tar.gz
Fix documents
-rw-r--r--doc/administration/job_traces.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/administration/job_traces.md b/doc/administration/job_traces.md
index f1c5b194f4c..24d1a3fd151 100644
--- a/doc/administration/job_traces.md
+++ b/doc/administration/job_traces.md
@@ -77,10 +77,10 @@ cloud-native, for example on Kubernetes.
The data flow is the same as described in the [data flow section](#data-flow)
with one change: _the stored path of the first two phases is different_. This new live
-trace architecture stores chunks of traces in Redis and the database instead of
+trace architecture stores chunks of traces in Redis and a persistent store (object storage or database) instead of
file storage. Redis is used as first-class storage, and it stores up-to 128KB
-of data. Once the full chunk is sent, it is flushed to database. After a while,
-the data in Redis and database will be archived to [object storage](#uploading-traces-to-object-storage).
+of data. Once the full chunk is sent, it is flushed a persistent store, either object storage(temporary directory) or database.
+After a while, the data in Redis and a persitent store will be archived to [object storage](#uploading-traces-to-object-storage).
The data are stored in the following Redis namespace: `Gitlab::Redis::SharedState`.
@@ -89,11 +89,11 @@ Here is the detailed data flow:
1. GitLab Runner picks a job from GitLab
1. GitLab Runner sends a piece of trace to GitLab
1. GitLab appends the data to Redis
-1. Once the data in Redis reach 128KB, the data is flushed to the database.
+1. Once the data in Redis reach 128KB, the data is flushed to a persistent store (object storage or the database).
1. The above steps are repeated until the job is finished.
1. Once the job is finished, GitLab schedules a Sidekiq worker to archive the trace.
1. The Sidekiq worker archives the trace to object storage and cleans up the trace
- in Redis and the database.
+ in Redis and a persistent store (object storage or the database).
### Enabling live trace