From 2bc94d8a5b9ac9fbde6c808bf4c6f48be821d40d Mon Sep 17 00:00:00 2001
From: Frederik Ring <frederik.ring@gmail.com>
Date: Sat, 27 Jan 2024 19:42:21 +0100
Subject: [PATCH] Time out after five minutes of not reaching desired container
 count

---
 cmd/backup/docker.go | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/cmd/backup/docker.go b/cmd/backup/docker.go
index ed60170..9caaad4 100644
--- a/cmd/backup/docker.go
+++ b/cmd/backup/docker.go
@@ -42,22 +42,34 @@ func scaleService(cli *client.Client, serviceID string, replicas uint64) ([]stri
 }
 
 func awaitContainerCountForService(cli *client.Client, serviceID string, count int) error {
+	poll := time.NewTicker(time.Second)
+	timeout := time.NewTicker(5 * time.Minute)
+	defer timeout.Stop()
+	defer poll.Stop()
+
 	for {
-		containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{
-			Filters: filters.NewArgs(filters.KeyValuePair{
-				Key:   "label",
-				Value: fmt.Sprintf("com.docker.swarm.service.id=%s", serviceID),
-			}),
-		})
-		if err != nil {
-			return fmt.Errorf("awaitContainerCount: error listing containers: %w", err)
+		select {
+		case <-timeout.C:
+			return fmt.Errorf(
+				"awaitContainerCount: timed out after waiting 5 minutes for service %s to reach desired container count of %d",
+				serviceID,
+				count,
+			)
+		case <-poll.C:
+			containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{
+				Filters: filters.NewArgs(filters.KeyValuePair{
+					Key:   "label",
+					Value: fmt.Sprintf("com.docker.swarm.service.id=%s", serviceID),
+				}),
+			})
+			if err != nil {
+				return fmt.Errorf("awaitContainerCount: error listing containers: %w", err)
+			}
+			if len(containers) == count {
+				return nil
+			}
 		}
-		if len(containers) == count {
-			break
-		}
-		time.Sleep(time.Second)
 	}
-	return nil
 }
 
 // stopContainersAndServices stops all Docker containers that are marked as to being