From cd97573b5009fec6ff54b347f3fadf9d949a7600 Mon Sep 17 00:00:00 2001 From: arulajmani Date: Mon, 12 Apr 2021 19:13:38 -0400 Subject: [PATCH] sql: fix multi-region test knob There was an error in the `RunBeforeMultiRegionUpdates` knob such that if it were set, we would short circuit. The intention, instead, was to only short circuit in the error case. Release note: None --- pkg/sql/type_change.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkg/sql/type_change.go b/pkg/sql/type_change.go index 0eaa98cae489..b1cbcddc000b 100644 --- a/pkg/sql/type_change.go +++ b/pkg/sql/type_change.go @@ -370,7 +370,9 @@ func (t *typeSchemaChanger) exec(ctx context.Context) error { return err } if fn := t.execCfg.TypeSchemaChangerTestingKnobs.RunBeforeMultiRegionUpdates; fn != nil { - return fn() + if err := fn(); err != nil { + return err + } } repartitionedTables, err = performMultiRegionFinalization( ctx,