changefeedccl: fix table drop shutdown for enriched envelope

asg0451 · asg0451 · commit fc128c7c2d12 · 2025-06-13T14:11:21.000-04:00
Fixes a bug where feeds with enriched envelopes and a `source` field could treat table drops as transient errors. Fixes: #148216 Release note: None
diff --git a/pkg/ccl/changefeedccl/enriched_source_provider.go b/pkg/ccl/changefeedccl/enriched_source_provider.go
@@ -540,6 +540,9 @@ func getDescriptors(
 		return nil
 	}
 	if err := execCfg.InternalDB.DescsTxn(ctx, f, isql.WithPriority(admissionpb.NormalPri)); err != nil {
+		if errors.Is(err, catalog.ErrDescriptorDropped) {
+			err = changefeedbase.WithTerminalError(err)
+		}
 		return nil, nil, nil, err
 	}
 	return tableDescriptor, dbDescriptor, schemaDescriptor, nil

Original file line number	Diff line number	Diff line change
`@@ -540,6 +540,9 @@ func getDescriptors(`
`540`	`540`	`return nil`
`541`	`541`	`}`
`542`	`542`	`if err := execCfg.InternalDB.DescsTxn(ctx, f, isql.WithPriority(admissionpb.NormalPri)); err != nil {`
	`543`	`+ if errors.Is(err, catalog.ErrDescriptorDropped) {`
	`544`	`+ err = changefeedbase.WithTerminalError(err)`
	`545`	`+ }`
`543`	`546`	`return nil, nil, nil, err`
`544`	`547`	`}`
`545`	`548`	`return tableDescriptor, dbDescriptor, schemaDescriptor, nil`