From 761dbb4352deb081552491893ccce5fb1c00ad0a Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Wed, 1 Jun 2022 09:49:40 -0700 Subject: [PATCH] Fix zuul merger graceful stops Previously the merger docker-compose restart value was set to always. This caused the merger to immediately restart after asking it to gracefully stop and our check for the merger stopping: docker-compose ps -q | xargs docker wait never saw it as being stopped. Make the mergers match executors and restart only on failure. This should allow us to gracefully stop the mergers with intention and detect they are stopped for maintenance purposes. Change-Id: Ia8d12fbf6a45e4ca85174ccafd18b5d2351c26c1 --- playbooks/roles/zuul-merger/files/docker-compose.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playbooks/roles/zuul-merger/files/docker-compose.yaml b/playbooks/roles/zuul-merger/files/docker-compose.yaml index db62d16c11..ee665e54ab 100644 --- a/playbooks/roles/zuul-merger/files/docker-compose.yaml +++ b/playbooks/roles/zuul-merger/files/docker-compose.yaml @@ -4,7 +4,7 @@ version: '2' services: merger: - restart: always + restart: on-failure image: docker.io/zuul/zuul-merger:latest network_mode: host user: zuul