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

VTGate MoveTables Buffering: Fix panic when buffering is disabled #16922

Merged
merged 3 commits into from
Oct 11, 2024
Merged

VTGate MoveTables Buffering: Fix panic when buffering is disabled #16922

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4632ac2
Use default timeout if buffering is not enabled and prevent a panic
rohit-nayak-ps Oct 9, 2024
cd0a392
Address code review
rohit-nayak-ps Oct 10, 2024
67ee014
test: added unit test
harshit-gangal Oct 11, 2024
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
5 changes: 4 additions & 1 deletion go/vt/vtgate/plan_execute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,10 @@ func (e *Executor) newExecute(
// based on the buffering configuration. This way we should be able to perform the max retries
// within the given window of time for most queries and we should not end up waiting too long
// after the traffic switch fails or the buffer window has ended, retrying old queries.
timeout := e.resolver.scatterConn.gateway.buffer.GetConfig().MaxFailoverDuration / (MaxBufferingRetries - 1)
timeout := 30 * time.Second
if e.resolver.scatterConn.gateway.buffer != nil {
mattlord marked this conversation as resolved.
Show resolved Hide resolved
timeout = e.resolver.scatterConn.gateway.buffer.GetConfig().MaxFailoverDuration / (MaxBufferingRetries - 1)
}
if waitForNewerVSchema(ctx, e, lastVSchemaCreated, timeout) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add a unit test for the change.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! I was going to suggest the same thing though ^^ 🙂 If it's very difficult to do for some reason then we can put that off.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@harshit-gangal, where would I do that now and what should the unit test check for? I don't see any obvious framework to add a test for newExecute and there is no plan_execute_test.go

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It can be placed in executor_test.
Let me see if I can add it

vs = e.VSchema()
lastVSchemaCreated = vs.GetCreated()
Expand Down
Loading