From 2cc6d8d54427827cadf75f5962f1f5576c9bb48c Mon Sep 17 00:00:00 2001 From: Rohit Nayak Date: Fri, 30 Jun 2023 08:21:33 +0200 Subject: [PATCH] Address review comments Signed-off-by: Rohit Nayak --- go/vt/vttablet/tabletserver/schema/engine.go | 2 +- go/vt/wrangler/traffic_switcher.go | 3 ++- test/config.json | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/go/vt/vttablet/tabletserver/schema/engine.go b/go/vt/vttablet/tabletserver/schema/engine.go index bc0b676c1ad..8503afa7ec7 100644 --- a/go/vt/vttablet/tabletserver/schema/engine.go +++ b/go/vt/vttablet/tabletserver/schema/engine.go @@ -855,7 +855,7 @@ func (se *Engine) ResetSequences(tables []string) error { table.SequenceInfo.Reset() } } else { - return vterrors.Errorf(vtrpcpb.Code_INTERNAL, "table %v not found in schema", tableName) + return vterrors.Errorf(vtrpcpb.Code_NOT_FOUND, "table %v not found in schema", tableName) } } return nil diff --git a/go/vt/wrangler/traffic_switcher.go b/go/vt/wrangler/traffic_switcher.go index f14a6bf8d34..43ab57b8ca8 100644 --- a/go/vt/wrangler/traffic_switcher.go +++ b/go/vt/wrangler/traffic_switcher.go @@ -1918,7 +1918,8 @@ func (ts *trafficSwitcher) resetSequences(ctx context.Context) error { return nil } return ts.ForAllSources(func(source *workflow.MigrationSource) error { - ts.Logger().Infof("Resetting sequences for source %s", source.GetPrimary().String()) + ts.Logger().Infof("Resetting sequences for source shard %s.%s on tablet %s", + source.GetShard().Keyspace(), source.GetShard().ShardName(), source.GetPrimary().String()) return ts.TabletManagerClient().ResetSequences(ctx, source.GetPrimary().Tablet, ts.Tables()) }) } diff --git a/test/config.json b/test/config.json index cdf770d6769..614307a296a 100644 --- a/test/config.json +++ b/test/config.json @@ -1008,12 +1008,12 @@ "RetryMax": 0, "Tags": [] }, - "vreplication_partial_movetables_simple": { + "vreplication_partial_movetables_basic": { "File": "unused.go", "Args": ["vitess.io/vitess/go/test/endtoend/vreplication", "-run", "PartialMoveTablesBasic"], "Command": [], "Manual": false, - "Shard": "vreplication_partial_movetables_simple", + "Shard": "vreplication_partial_movetables_basic", "RetryMax": 0, "Tags": [] },