Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Release 17.0]: Online DDL: timeouts for all gRPC calls (#14182) #14190

Merged
merged 2 commits into from
Oct 10, 2023
Merged

[Release 17.0]: Online DDL: timeouts for all gRPC calls (#14182) #14190

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8082ca3
Online DDL: timeouts for all gRPC calls (#14182)
shlomi-noach Oct 5, 2023
f18e7f5
empty commit to kick CI
shlomi-noach Oct 5, 2023
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
19 changes: 13 additions & 6 deletions go/vt/vttablet/onlineddl/executor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ const (
readyToCompleteHint = "ready_to_complete"
databasePoolSize = 3
qrBufferExtraTimeout = 5 * time.Second
grpcTimeout = 30 * time.Second
vreplicationTestSuiteWaitSeconds = 5
)

Expand Down Expand Up @@ -737,9 +738,6 @@ func (e *Executor) primaryPosition(ctx context.Context) (pos mysql.Position, err

// terminateVReplMigration stops vreplication, then removes the _vt.vreplication entry for the given migration
func (e *Executor) terminateVReplMigration(ctx context.Context, uuid string) error {
tmClient := e.tabletManagerClient()
defer tmClient.Close()

tablet, err := e.ts.GetTablet(ctx, e.tabletAlias)
if err != nil {
return err
Expand Down Expand Up @@ -918,11 +916,13 @@ func (e *Executor) cutOverVReplMigration(ctx context.Context, s *VReplStream) er

e.toggleBufferTableFunc(bufferingCtx, onlineDDL.Table, timeout, bufferQueries)
if !bufferQueries {
grpcCtx, cancel := context.WithTimeout(ctx, grpcTimeout)
defer cancel()
// called after new table is in place.
// unbuffer existing queries:
bufferingContextCancel()
// force re-read of tables
if err := tmClient.RefreshState(ctx, tablet.Tablet); err != nil {
if err := tmClient.RefreshState(grpcCtx, tablet.Tablet); err != nil {
return err
}
}
Expand Down Expand Up @@ -3754,7 +3754,10 @@ func (e *Executor) vreplicationExec(ctx context.Context, tablet *topodatapb.Tabl
tmClient := e.tabletManagerClient()
defer tmClient.Close()

return tmClient.VReplicationExec(ctx, tablet, query)
grpcCtx, cancel := context.WithTimeout(ctx, grpcTimeout)
defer cancel()

return tmClient.VReplicationExec(grpcCtx, tablet, query)
}

// reloadSchema issues a ReloadSchema on this tablet
Expand All @@ -3766,7 +3769,11 @@ func (e *Executor) reloadSchema(ctx context.Context) error {
if err != nil {
return err
}
return tmClient.ReloadSchema(ctx, tablet.Tablet, "")

grpcCtx, cancel := context.WithTimeout(ctx, grpcTimeout)
defer cancel()

return tmClient.ReloadSchema(grpcCtx, tablet.Tablet, "")
}

// deleteVReplicationEntry cleans up a _vt.vreplication entry; this function is called as part of
Expand Down
Loading