Skip to content

Commit 788f811

Browse files
MDBF-933 - DockerLatentWorker containers name not unique
Buildbot calculate the container name on a worker host based on the sha of the master name. If the master name is the same between dev / prod, which is true at this moment (both environments running in containers), then when the same builder runs on the same host on both environments a conflict will occur causing one of the builds to fail and retry. Error: The container name "/buildbot-hz-bbw1-docker-tarball-debian-12-15cc21" is already in use by container This is an error on the development environment when a build << tarball-docker >> was already running in production on hz-bbw1. Sometimes builds get stuck in "Preparing worker" state and Production is affected. This is why this patch is important, because we can impact Production during our tests in buildbot.dev.mariadb.org
1 parent 7199ce3 commit 788f811

File tree

2 files changed

+19
-15
lines changed

2 files changed

+19
-15
lines changed

docker-compose/docker-compose.yaml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ services:
122122
- TITLE
123123
- TITLE_URL
124124
stop_grace_period: 5m
125-
hostname: master-nonlatent
125+
hostname: dev_master-nonlatent
126126
volumes:
127127
- ./logs:/var/log/buildbot
128128
- ./buildbot/:/srv/buildbot/master
@@ -162,7 +162,7 @@ services:
162162
- TITLE
163163
- TITLE_URL
164164
stop_grace_period: 5m
165-
hostname: master-libvirt
165+
hostname: dev_master-libvirt
166166
volumes:
167167
- ./logs:/var/log/buildbot
168168
- ./buildbot/:/srv/buildbot/master
@@ -201,7 +201,7 @@ services:
201201
- TITLE
202202
- TITLE_URL
203203
stop_grace_period: 5m
204-
hostname: autogen_aarch64-master-0
204+
hostname: dev_autogen_aarch64-master-0
205205
volumes:
206206
- ./logs:/var/log/buildbot
207207
- ./buildbot/:/srv/buildbot/master
@@ -240,7 +240,7 @@ services:
240240
- TITLE
241241
- TITLE_URL
242242
stop_grace_period: 5m
243-
hostname: autogen_amd64-master-0
243+
hostname: dev_autogen_amd64-master-0
244244
volumes:
245245
- ./logs:/var/log/buildbot
246246
- ./buildbot/:/srv/buildbot/master
@@ -279,7 +279,7 @@ services:
279279
- TITLE
280280
- TITLE_URL
281281
stop_grace_period: 5m
282-
hostname: autogen_amd64-master-1
282+
hostname: dev_autogen_amd64-master-1
283283
volumes:
284284
- ./logs:/var/log/buildbot
285285
- ./buildbot/:/srv/buildbot/master
@@ -318,7 +318,7 @@ services:
318318
- TITLE
319319
- TITLE_URL
320320
stop_grace_period: 5m
321-
hostname: autogen_ppc64le-master-0
321+
hostname: dev_autogen_ppc64le-master-0
322322
volumes:
323323
- ./logs:/var/log/buildbot
324324
- ./buildbot/:/srv/buildbot/master
@@ -357,7 +357,7 @@ services:
357357
- TITLE
358358
- TITLE_URL
359359
stop_grace_period: 5m
360-
hostname: autogen_s390x-master-0
360+
hostname: dev_autogen_s390x-master-0
361361
volumes:
362362
- ./logs:/var/log/buildbot
363363
- ./buildbot/:/srv/buildbot/master
@@ -396,7 +396,7 @@ services:
396396
- TITLE
397397
- TITLE_URL
398398
stop_grace_period: 5m
399-
hostname: autogen_x86-master-0
399+
hostname: dev_autogen_x86-master-0
400400
volumes:
401401
- ./logs:/var/log/buildbot
402402
- ./buildbot/:/srv/buildbot/master
@@ -435,7 +435,7 @@ services:
435435
- TITLE
436436
- TITLE_URL
437437
stop_grace_period: 5m
438-
hostname: master-docker-nonstandard
438+
hostname: dev_master-docker-nonstandard
439439
volumes:
440440
- ./logs:/var/log/buildbot
441441
- ./buildbot/:/srv/buildbot/master
@@ -475,7 +475,7 @@ services:
475475
- TITLE
476476
- TITLE_URL
477477
stop_grace_period: 5m
478-
hostname: master-galera
478+
hostname: dev_master-galera
479479
volumes:
480480
- ./logs:/var/log/buildbot
481481
- ./buildbot/:/srv/buildbot/master
@@ -514,7 +514,7 @@ services:
514514
- TITLE
515515
- TITLE_URL
516516
stop_grace_period: 5m
517-
hostname: master-protected-branches
517+
hostname: dev_master-protected-branches
518518
volumes:
519519
- ./logs:/var/log/buildbot
520520
- ./buildbot/:/srv/buildbot/master
@@ -553,7 +553,7 @@ services:
553553
- TITLE
554554
- TITLE_URL
555555
stop_grace_period: 5m
556-
hostname: master-docker-nonstandard-2
556+
hostname: dev_master-docker-nonstandard-2
557557
volumes:
558558
- ./logs:/var/log/buildbot
559559
- ./buildbot/:/srv/buildbot/master
@@ -593,7 +593,7 @@ services:
593593
- TITLE
594594
- TITLE_URL
595595
stop_grace_period: 5m
596-
hostname: master-bintars
596+
hostname: dev_master-bintars
597597
volumes:
598598
- ./logs:/var/log/buildbot
599599
- ./buildbot/:/srv/buildbot/master

docker-compose/generate-config.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@
115115
restart: unless-stopped
116116
container_name: {master_name}
117117
stop_grace_period: {buildbot_stop_grace_period}
118-
hostname: {master_name}
118+
hostname: {master_hostname}
119119
{volumes}
120120
entrypoint:
121121
- /bin/bash
@@ -213,10 +213,14 @@ def main(args):
213213
port = starting_port
214214
for master_directory in MASTER_DIRECTORIES:
215215
master_name = master_directory.replace("/", "_")
216-
216+
if args.env == "dev":
217+
master_hostname = "dev_" + master_name
218+
else:
219+
master_hostname = master_name
217220
# Generate Docker Compose piece
218221
docker_compose_piece = docker_compose_template.format(
219222
master_name=master_name,
223+
master_hostname=master_hostname,
220224
master_directory=master_directory,
221225
port=port,
222226
mc_host=mc_host,

0 commit comments

Comments
 (0)