Merge pull request #16057 from mheon/fix_16046

openshift-merge-robot · web-flow · commit d33a31524a27 · 2022-10-07T00:48:11.000+02:00
Clean up when stopping pods
diff --git a/pkg/domain/infra/abi/pods.go b/pkg/domain/infra/abi/pods.go
@@ -195,7 +195,7 @@ func (ic *ContainerEngine) PodStop(ctx context.Context, namesOrIds []string, opt
 	}
 	for _, p := range pods {
 		report := entities.PodStopReport{Id: p.ID()}
-		errs, err := p.StopWithTimeout(ctx, false, options.Timeout)
+		errs, err := p.StopWithTimeout(ctx, true, options.Timeout)
 		if err != nil && !errors.Is(err, define.ErrPodPartialFail) {
 			report.Errs = []error{err}
 			reports = append(reports, &report)

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ func (ic *ContainerEngine) PodStop(ctx context.Context, namesOrIds []string, opt`
`195`	`195`	`}`
`196`	`196`	`for _, p := range pods {`
`197`	`197`	`report := entities.PodStopReport{Id: p.ID()}`
`198`		`- errs, err := p.StopWithTimeout(ctx, false, options.Timeout)`
	`198`	`+ errs, err := p.StopWithTimeout(ctx, true, options.Timeout)`
`199`	`199`	`if err != nil && !errors.Is(err, define.ErrPodPartialFail) {`
`200`	`200`	`report.Errs = []error{err}`
`201`	`201`	`reports = append(reports, &report)`