offen/docker-volume-backup
2
0
Fork 0
mirror of https://github.com/offen/docker-volume-backup.git synced 2024-11-26 23:20:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Timeout when scaling down services should be configurable

Browse Source
This commit is contained in:
Frederik Ring 2024-01-28 14:35:02 +01:00
parent 409496af24
commit 9acd6dc8ab
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/backup/config.go
View File

@ -38,6 +38,7 @@ type Config struct {
BackupPruningLeeway time.Duration `split_words:"true" default:"1m"` BackupPruningLeeway time.Duration `split_words:"true" default:"1m"`
BackupPruningPrefix string `split_words:"true"` BackupPruningPrefix string `split_words:"true"`
BackupStopContainerLabel string `split_words:"true" default:"true"` BackupStopContainerLabel string `split_words:"true" default:"true"`
BackupStopServiceTimeout time.Duration `split_words:"true" default:"5m"`
BackupFromSnapshot bool `split_words:"true"` BackupFromSnapshot bool `split_words:"true"`
BackupExcludeRegexp RegexpDecoder `split_words:"true"` BackupExcludeRegexp RegexpDecoder `split_words:"true"`
BackupSkipBackendsFromPrune []string `split_words:"true"` BackupSkipBackendsFromPrune []string `split_words:"true"`

9
cmd/backup/docker.go
View File

@ -41,9 +41,9 @@ func scaleService(cli *client.Client, serviceID string, replicas uint64) ([]stri
return response.Warnings, nil return response.Warnings, nil
} }
func awaitContainerCountForService(cli *client.Client, serviceID string, count int) error { func awaitContainerCountForService(cli *client.Client, serviceID string, count int, timeoutAfter time.Duration) error {
poll := time.NewTicker(time.Second) poll := time.NewTicker(time.Second)
timeout := time.NewTimer(5 * time.Minute) timeout := time.NewTimer(timeoutAfter)
defer timeout.Stop() defer timeout.Stop()
defer poll.Stop() defer poll.Stop()
@ -51,7 +51,8 @@ func awaitContainerCountForService(cli *client.Client, serviceID string, count i
select { select {
case <-timeout.C: case <-timeout.C:
return fmt.Errorf( return fmt.Errorf(
"awaitContainerCount: timed out after waiting 5 minutes for service %s to reach desired container count of %d", "awaitContainerCount: timed out after waiting %s for service %s to reach desired container count of %d",
timeoutAfter,
serviceID, serviceID,
count, count,
) )
@ -196,7 +197,7 @@ func (s *script) stopContainersAndServices() (func() error, error) {
} }
// progress.ServiceProgress returns too early, so we need to manually check // progress.ServiceProgress returns too early, so we need to manually check
// whether all containers belonging to the service have actually been removed // whether all containers belonging to the service have actually been removed
if err := awaitContainerCountForService(s.cli, svc.serviceID, 0); err != nil { if err := awaitContainerCountForService(s.cli, svc.serviceID, 0, s.c.BackupStopServiceTimeout); err != nil {
scaleDownErrors.append(err) scaleDownErrors.append(err)
} }
}(svc) }(svc)

8
docs/reference/index.md
View File

@ -326,6 +326,14 @@ You can populate below template according to your requirements and use it as you
# BACKUP_STOP_CONTAINER_LABEL="service1" # BACKUP_STOP_CONTAINER_LABEL="service1"
# When trying to scale down Docker Swarm services, give up after
# the specified amount of time in case the service has not converged yet.
# In case you need to adjust this timeout, supply a duration
# value as per https://pkg.go.dev/time#ParseDuration to `BACKUP_STOP_SERVICE_TIMEOUT`.
# Defaults to 5 minutes.
# BACKUP_STOP_SERVICE_TIMEOUT="5m"
########### EXECUTING COMMANDS IN CONTAINERS PRE/POST BACKUP ########### EXECUTING COMMANDS IN CONTAINERS PRE/POST BACKUP
# It is possible to define commands to be run in any container before and after # It is possible to define commands to be run in any container before and after