From 511b79bd436812330eeb8759145d53a4a0ad2892 Mon Sep 17 00:00:00 2001
From: Frederik Ring <frederik.ring@gmail.com>
Date: Thu, 25 Jan 2024 20:14:15 +0100
Subject: [PATCH] Scale services back up

---
 cmd/backup/script.go | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/cmd/backup/script.go b/cmd/backup/script.go
index a5535e1..2902f7a 100644
--- a/cmd/backup/script.go
+++ b/cmd/backup/script.go
@@ -394,15 +394,6 @@ func (s *script) stopContainersAndServices() (func() error, error) {
 		}
 	}
 
-	var stopError error
-	if len(stopErrors) != 0 {
-		stopError = fmt.Errorf(
-			"stopContainers: %d error(s) stopping containers: %w",
-			len(stopErrors),
-			errors.Join(stopErrors...),
-		)
-	}
-
 	var scaledDownServices []swarm.Service
 	var scaleDownErrors []error
 	if isDockerSwarm {
@@ -432,6 +423,16 @@ func (s *script) stopContainersAndServices() (func() error, error) {
 		ScaleDownErrors: uint(len(scaleDownErrors)),
 	}
 
+	var initialErr error
+	allErrors := append(stopErrors, scaleDownErrors...)
+	if len(allErrors) != 0 {
+		initialErr = fmt.Errorf(
+			"stopContainers: %d error(s) stopping containers: %w",
+			len(allErrors),
+			errors.Join(allErrors...),
+		)
+	}
+
 	return func() error {
 		servicesRequiringForceUpdate := map[string]struct{}{}
 
@@ -469,21 +470,34 @@ func (s *script) stopContainersAndServices() (func() error, error) {
 			}
 		}
 
-		if len(restartErrors) != 0 {
+		var scaleUpErrors []error
+		if isDockerSwarm {
+			for _, service := range servicesToScaleDown {
+				service.Spec.Mode.Replicated.Replicas = service.PreviousSpec.Mode.Replicated.Replicas
+				service.Spec.TaskTemplate.ForceUpdate += 1
+				if _, err := s.cli.ServiceUpdate(context.Background(), service.ID, service.Version, service.Spec, types.ServiceUpdateOptions{}); err != nil {
+					scaleUpErrors = append(scaleUpErrors, err)
+				}
+			}
+		}
+
+		allErrors := append(restartErrors, scaleUpErrors...)
+		if len(allErrors) != 0 {
 			return fmt.Errorf(
 				"stopContainers: %d error(s) restarting containers and services: %w",
-				len(restartErrors),
-				errors.Join(restartErrors...),
+				len(allErrors),
+				errors.Join(allErrors...),
 			)
 		}
 		s.logger.Info(
 			fmt.Sprintf(
-				"Restarted %d container(s) and the matching service(s).",
+				"Restarted %d container(s) and %d service(s).",
 				len(stoppedContainers),
+				len(scaledDownServices),
 			),
 		)
 		return nil
-	}, stopError
+	}, initialErr
 }
 
 // createArchive creates a tar archive of the configured backup location and