Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
synapse
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maunium
synapse
Commits
c75836fe
Unverified
Commit
c75836fe
authored
2 years ago
by
realtyem
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Strip whitespace from worker types in Dockerfile-workers (#14165)
parent
bc2bd92b
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
changelog.d/14165.docker
+1
-0
1 addition, 0 deletions
changelog.d/14165.docker
docker/configure_workers_and_start.py
+2
-4
2 additions, 4 deletions
docker/configure_workers_and_start.py
with
3 additions
and
4 deletions
changelog.d/14165.docker
0 → 100644
+
1
−
0
View file @
c75836fe
Prevent a class of database sharding errors when using `Dockerfile-workers` to spawn multiple instances of the same worker. Contributed by Jason Little.
This diff is collapsed.
Click to expand it.
docker/configure_workers_and_start.py
+
2
−
4
View file @
c75836fe
...
...
@@ -402,8 +402,8 @@ def generate_worker_files(
# No workers, just the main process
worker_types
=
[]
else
:
# Split type names by comma
worker_types
=
worker_types_env
.
split
(
"
,
"
)
# Split type names by comma
, ignoring whitespace.
worker_types
=
[
x
.
strip
()
for
x
in
worker_types_env
.
split
(
"
,
"
)
]
# Create the worker configuration directory if it doesn't already exist
os
.
makedirs
(
"
/conf/workers
"
,
exist_ok
=
True
)
...
...
@@ -422,8 +422,6 @@ def generate_worker_files(
# For each worker type specified by the user, create config values
for
worker_type
in
worker_types
:
worker_type
=
worker_type
.
strip
()
worker_config
=
WORKERS_CONFIG
.
get
(
worker_type
)
if
worker_config
:
worker_config
=
worker_config
.
copy
()
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment