From e3062a4df73aa5fe4703099018e75a1f41defb50 Mon Sep 17 00:00:00 2001 From: Frederik Ring Date: Fri, 26 Jan 2024 15:59:30 +0100 Subject: [PATCH] Use progress tool from Docker CLI --- cmd/backup/script.go | 39 ++++++++++++++++++++++++++------ go.mod | 3 +++ go.sum | 3 +++ test/services/docker-compose.yml | 2 -- 4 files changed, 38 insertions(+), 9 deletions(-) diff --git a/cmd/backup/script.go b/cmd/backup/script.go index 2902f7a..0d49fe6 100644 --- a/cmd/backup/script.go +++ b/cmd/backup/script.go @@ -30,6 +30,7 @@ import ( openpgp "github.com/ProtonMail/go-crypto/openpgp/v2" "github.com/containrrr/shoutrrr" "github.com/containrrr/shoutrrr/pkg/router" + "github.com/docker/cli/cli/command/service/progress" "github.com/docker/docker/api/types" ctr "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" @@ -318,6 +319,14 @@ func newScript() (*script, error) { return s, nil } +type noopWriteCloser struct { + io.Writer +} + +func (noopWriteCloser) Close() error { + return nil +} + // stopContainersAndServices stops all Docker containers that are marked as to being // stopped during the backup and returns a function that can be called to // restart everything that has been stopped. @@ -363,6 +372,7 @@ func (s *script) stopContainersAndServices() (func() error, error) { Key: "label", Value: matchLabel, }), + Status: true, }) if err != nil { return noop, fmt.Errorf("stopContainers: error querying for services to scale down: %w", err) @@ -398,10 +408,22 @@ func (s *script) stopContainersAndServices() (func() error, error) { var scaleDownErrors []error if isDockerSwarm { for _, service := range servicesToScaleDown { - var zero uint64 - service.Spec.Mode.Replicated.Replicas = &zero - service.Spec.TaskTemplate.ForceUpdate += 1 - if _, err := s.cli.ServiceUpdate(context.Background(), service.ID, service.Version, service.Spec, types.ServiceUpdateOptions{}); err != nil { + var zero uint64 = 0 + serviceMode := &service.Spec.Mode + switch { + case serviceMode.Replicated != nil: + serviceMode.Replicated.Replicas = &zero + default: + scaleDownErrors = append(scaleDownErrors, errors.New("Labeled service has to be in replicated mode")) + continue + } + + _, err := s.cli.ServiceUpdate(context.Background(), service.ID, service.Version, service.Spec, types.ServiceUpdateOptions{}) + if err != nil { + scaleDownErrors = append(scaleDownErrors, err) + } + + if err := progress.ServiceProgress(context.Background(), s.cli, service.ID, &noopWriteCloser{io.Discard}); err != nil { scaleDownErrors = append(scaleDownErrors, err) } else { scaledDownServices = append(scaledDownServices, service) @@ -473,9 +495,12 @@ func (s *script) stopContainersAndServices() (func() error, error) { 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 { + updatedService, _, _ := s.cli.ServiceInspectWithRaw(context.Background(), service.ID, types.ServiceInspectOptions{}) + updatedService.Spec.Mode.Replicated.Replicas = updatedService.PreviousSpec.Mode.Replicated.Replicas + if _, err := s.cli.ServiceUpdate(context.Background(), updatedService.ID, updatedService.Version, updatedService.Spec, types.ServiceUpdateOptions{}); err != nil { + scaleUpErrors = append(scaleUpErrors, err) + } + if err := progress.ServiceProgress(context.Background(), s.cli, updatedService.ID, &noopWriteCloser{io.Discard}); err != nil { scaleUpErrors = append(scaleUpErrors, err) } } diff --git a/go.mod b/go.mod index 3536e13..6047793 100644 --- a/go.mod +++ b/go.mod @@ -7,6 +7,7 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.2.1 github.com/containrrr/shoutrrr v0.7.1 github.com/cosiner/argv v0.1.0 + github.com/docker/cli v25.0.1+incompatible github.com/docker/docker v24.0.7+incompatible github.com/gofrs/flock v0.8.1 github.com/klauspost/compress v1.17.4 @@ -22,9 +23,11 @@ require ( ) require ( + github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect github.com/cloudflare/circl v1.3.7 // indirect github.com/golang-jwt/jwt/v5 v5.2.0 // indirect github.com/golang/protobuf v1.5.3 // indirect + golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect google.golang.org/appengine v1.6.7 // indirect google.golang.org/protobuf v1.31.0 // indirect ) diff --git a/go.sum b/go.sum index dbd4a22..679ab93 100644 --- a/go.sum +++ b/go.sum @@ -253,6 +253,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dnaeon/go-vcr v1.2.0 h1:zHCHvJYTMh1N7xnV7zf1m1GPBF9Ad0Jk/whtQ1663qI= github.com/dnaeon/go-vcr v1.2.0/go.mod h1:R4UdLID7HZT3taECzJs4YgbbH6PIGXB6W/sc5OLb6RQ= +github.com/docker/cli v25.0.1+incompatible h1:mFpqnrS6Hsm3v1k7Wa/BO23oz0k121MTbTO1lpcGSkU= +github.com/docker/cli v25.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM= @@ -1241,6 +1243,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3 h1:4AuOwCGf4lLR9u3YOe2awrHygurzhO/HeQ6laiA6Sx0= diff --git a/test/services/docker-compose.yml b/test/services/docker-compose.yml index dbbf8b9..69e083f 100644 --- a/test/services/docker-compose.yml +++ b/test/services/docker-compose.yml @@ -47,8 +47,6 @@ services: labels: - docker-volume-backup.stop-during-backup=true replicas: 2 - restart_policy: - condition: on-failure pg: image: postgres:14-alpine