Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions go/test/endtoend/reparent/utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ func setupCluster(ctx context.Context, t *testing.T, shardName string, cells []s
clusterInstance.VtTabletExtraArgs = []string{
"-lock_tables_timeout", "5s",
"-enable_semi_sync",
"-init_populate_metadata",
"-track_schema_versions=true",
}

Expand Down
3 changes: 0 additions & 3 deletions go/vt/vttablet/tabletmanager/tm_state.go
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,6 @@ func (ts *tmState) updateLocked(ctx context.Context) {
// before other services are shutdown.
reason := ts.canServe(ts.tablet.Type)
if reason != "" {
ts.populateLocalMetadataLocked()
log.Infof("Disabling query service: %v", reason)
if err := ts.tm.QueryServiceControl.SetServingType(ts.tablet.Type, terTime, false, reason); err != nil {
log.Errorf("SetServingType(serving=false) failed: %v", err)
Expand Down Expand Up @@ -281,8 +280,6 @@ func (ts *tmState) updateLocked(ctx context.Context) {
if err := ts.tm.QueryServiceControl.SetServingType(ts.tablet.Type, terTime, true, ""); err != nil {
log.Errorf("Cannot start query service: %v", err)
}

ts.populateLocalMetadataLocked()
}
}

Expand Down