Merge pull request #154685 from kev-cao/backport25.4-154531

kev-cao · web-flow · commit b2f55d0e9d76 · 2025-10-03T12:18:31.000-04:00
release-25.4: restore: fix restore hanging on server stop
diff --git a/pkg/backup/generative_split_and_scatter_processor.go b/pkg/backup/generative_split_and_scatter_processor.go
@@ -367,6 +367,7 @@ func (gssp *generativeSplitAndScatterProcessor) Start(ctx context.Context) {
 	}); err != nil {
 		gssp.scatterErr = err
 		cancel()
+		close(gssp.doneScatterCh)
 		close(workerDone)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -367,6 +367,7 @@ func (gssp *generativeSplitAndScatterProcessor) Start(ctx context.Context) {`
`367`	`367`	`}); err != nil {`
`368`	`368`	`gssp.scatterErr = err`
`369`	`369`	`cancel()`
	`370`	`+ close(gssp.doneScatterCh)`
`370`	`371`	`close(workerDone)`
`371`	`372`	`}`
`372`	`373`	`}`