fix(container): skip old cleanup on canceled deploy context

1 file · +6 -0

M internal/usecase/container/service.go +6 -0


@@ -365,6 +365,7 @@ func (s *Service) finalizePreviousContainer(ctx context.Context, domainName stri
365	365		if !hasExisting {
366	366		return
367	367		}
	368	+	log := zerowrap.FromCtx(ctx)
368	369
369	370		drainDelay := s.config.DrainDelay
370	371		if drainDelay == 0 {

@@ -375,6 +376,11 @@ func (s *Service) finalizePreviousContainer(ctx context.Context, domainName stri
375	376		case <-ctx.Done():
376	377		}
377	378
	379	+	if err := ctx.Err(); err != nil {
	380	+	log.Debug().Err(err).Str("domain", domainName).Str("new_container_id", newContainerID).Msg("skipping old container cleanup due to canceled context")
	381	+	return
	382	+	}
	383	+
378	384		s.cleanupOldContainer(ctx, existing, newContainerID, domainName)
379	385		}
380	386


@@ -365,6 +365,7 @@ func (s *Service) finalizePreviousContainer(ctx context.Context, domainName stri
365	if !hasExisting {	365		if !hasExisting {
366	return	366		return
367	}	367		}
		368	+	log := zerowrap.FromCtx(ctx)
368		369
369	drainDelay := s.config.DrainDelay	370		drainDelay := s.config.DrainDelay
370	if drainDelay == 0 {	371		if drainDelay == 0 {

@@ -375,6 +376,11 @@ func (s *Service) finalizePreviousContainer(ctx context.Context, domainName stri
375	case <-ctx.Done():	376		case <-ctx.Done():
376	}	377		}
377		378
		379	+	if err := ctx.Err(); err != nil {
		380	+	log.Debug().Err(err).Str("domain", domainName).Str("new_container_id", newContainerID).Msg("skipping old container cleanup due to canceled context")
		381	+	return
		382	+	}
		383	+
378	s.cleanupOldContainer(ctx, existing, newContainerID, domainName)	384		s.cleanupOldContainer(ctx, existing, newContainerID, domainName)
379	}	385		}
380		386