Merge pull request cockroachdb#144718 from cockroachdb/blathers/backport-release-25.2-144642

kev-cao · web-flow · commit b9bdd0aad25d · 2025-04-21T11:09:14.000-04:00
release-25.2: backup: compaction dist sql processor now handles errors correctly
diff --git a/pkg/backup/compaction_dist.go b/pkg/backup/compaction_dist.go
@@ -130,7 +130,7 @@ func runCompactionPlan(
 
 	evalCtxCopy := execCtx.ExtendedEvalContext().Copy()
 	dsp.Run(ctx, planCtx, nil /* txn */, plan, recv, evalCtxCopy, nil /* finishedSetupFn */)
-	return nil
+	return rowResultWriter.Err()
 }
 
 // createCompactionPlan creates an un-finalized physical plan that will

Original file line number	Diff line number	Diff line change
`@@ -130,7 +130,7 @@ func runCompactionPlan(`
`130`	`130`
`131`	`131`	`evalCtxCopy := execCtx.ExtendedEvalContext().Copy()`
`132`	`132`	`dsp.Run(ctx, planCtx, nil /* txn /, plan, recv, evalCtxCopy, nil / finishedSetupFn */)`
`133`		`- return nil`
	`133`	`+ return rowResultWriter.Err()`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// createCompactionPlan creates an un-finalized physical plan that will`