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

Inline handling of in-swarm container level restart

Browse Source
This commit is contained in:
Frederik Ring 2024-01-27 19:48:50 +01:00
parent 2bc94d8a5b
commit 542d1fa69f
1 changed files with 20 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
cmd/backup/docker.go
View File

@ -229,46 +229,37 @@ func (s *script) stopContainersAndServices() (func() error, error) {
} }
return func() error { return func() error {
servicesRequiringForceUpdate := map[string]struct{}{}
var restartErrors []error var restartErrors []error
matchedServices := map[string]bool{}
for _, container := range stoppedContainers { for _, container := range stoppedContainers {
// in case a container was part of a swarm service, teh service requires to if swarmServiceID, ok := container.Labels["com.docker.swarm.service.id"]; ok && isDockerSwarm {
// be force updated instead of restarting the container as it would otherwise if _, ok := matchedServices[swarmServiceID]; ok {
// remain in a "completed" state continue
if swarmServiceName, ok := container.Labels["com.docker.swarm.service.name"]; ok {
servicesRequiringForceUpdate[swarmServiceName] = struct{}{}
continue
}
if err := s.cli.ContainerStart(context.Background(), container.ID, types.ContainerStartOptions{}); err != nil {
restartErrors = append(restartErrors, err)
}
}
if len(servicesRequiringForceUpdate) != 0 {
services, _ := s.cli.ServiceList(context.Background(), types.ServiceListOptions{})
for serviceName := range servicesRequiringForceUpdate {
var serviceMatch swarm.Service
for _, service := range services {
if service.Spec.Name == serviceName {
serviceMatch = service
break
}
} }
if serviceMatch.ID == "" { matchedServices[swarmServiceID] = true
// in case a container was part of a swarm service, the service requires to
// be force updated instead of restarting the container as it would otherwise
// remain in a "completed" state
service, _, err := s.cli.ServiceInspectWithRaw(context.Background(), swarmServiceID, types.ServiceInspectOptions{})
if err != nil {
restartErrors = append( restartErrors = append(
restartErrors, restartErrors,
fmt.Errorf("(*script).stopContainersAndServices: couldn't find service with name %s", serviceName), fmt.Errorf("(*script).stopContainersAndServices: error looking up parent service: %w", err),
) )
continue continue
} }
serviceMatch.Spec.TaskTemplate.ForceUpdate += 1 service.Spec.TaskTemplate.ForceUpdate += 1
if _, err := s.cli.ServiceUpdate( if _, err := s.cli.ServiceUpdate(
context.Background(), serviceMatch.ID, context.Background(), service.ID,
serviceMatch.Version, serviceMatch.Spec, types.ServiceUpdateOptions{}, service.Version, service.Spec, types.ServiceUpdateOptions{},
); err != nil { ); err != nil {
restartErrors = append(restartErrors, err) restartErrors = append(restartErrors, err)
} }
continue
}
if err := s.cli.ContainerStart(context.Background(), container.ID, types.ContainerStartOptions{}); err != nil {
restartErrors = append(restartErrors, err)
} }
} }
@ -297,7 +288,7 @@ func (s *script) stopContainersAndServices() (func() error, error) {
allErrors := append(restartErrors, scaleUpErrors.value()...) allErrors := append(restartErrors, scaleUpErrors.value()...)
if len(allErrors) != 0 { if len(allErrors) != 0 {
return fmt.Errorf( return fmt.Errorf(
"stopContainers: %d error(s) restarting containers and services: %w", "(*script).stopContainersAndServices: %d error(s) restarting containers and services: %w",
len(allErrors), len(allErrors),
errors.Join(allErrors...), errors.Join(allErrors...),
) )