diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-03 12:09:39 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-12-03 12:09:39 +0000 |
| commit | f145ef4be75f3711c52a680b86d96568e9acf385 (patch) | |
| tree | 5e90358a166062305cf41f73e541cf4744b76c4d /doc/development | |
| parent | 544eaa90817fa8595826fbd44f37452c76b56378 (diff) | |
| download | gitlab-ce-CSTarun.tar.gz | |
Add latest changes from gitlab-org/gitlab@masterCSTarun
Diffstat (limited to 'doc/development')
| -rw-r--r-- | doc/development/shell_scripting_guide/index.md | 2 | ||||
| -rw-r--r-- | doc/development/sidekiq_style_guide.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/development/shell_scripting_guide/index.md b/doc/development/shell_scripting_guide/index.md index 1f40a4d3200..6591a2013e9 100644 --- a/doc/development/shell_scripting_guide/index.md +++ b/doc/development/shell_scripting_guide/index.md @@ -92,7 +92,7 @@ use this job: ```yaml shfmt: - image: mvdan/shfmt:v3.1.0-alpine + image: mvdan/shfmt:v3.2.0-alpine stage: test before_script: - shfmt -version diff --git a/doc/development/sidekiq_style_guide.md b/doc/development/sidekiq_style_guide.md index 8e50c7647a3..2d9cb40d143 100644 --- a/doc/development/sidekiq_style_guide.md +++ b/doc/development/sidekiq_style_guide.md @@ -472,7 +472,7 @@ A job cannot be both high urgency and have external dependencies. Workers that are constrained by CPU or memory resource limitations should be annotated with the `worker_resource_boundary` method. -Most workers tend to spend most of their time blocked, wait on network responses +Most workers tend to spend most of their time blocked, waiting on network responses from other services such as Redis, PostgreSQL, and Gitaly. Since Sidekiq is a multi-threaded environment, these jobs can be scheduled with high concurrency. |