Skip to content

Fix query list override issue on mysql restart#11309

Merged
harshit-gangal merged 5 commits intovitessio:mainfrom
planetscale:reconnect-miss
Oct 4, 2022
Merged

Fix query list override issue on mysql restart#11309
harshit-gangal merged 5 commits intovitessio:mainfrom
planetscale:reconnect-miss

Conversation

@harshit-gangal
Copy link
Member

@harshit-gangal harshit-gangal commented Sep 21, 2022 •
edited
Loading

Description

This PR fixes the issue with the query list getting overridden when a MySQL restarts and the same connection ID is assigned to a different connection.

Related Issue(s)

Checklist

  • "Backport me!" label has been added if this change should be backported
  • Tests were added or are not required
  • Documentation was added or is not required

Deployment Notes

@vitess-bot
Copy link
Contributor

vitess-bot bot commented Sep 21, 2022 •
edited
Loading

Review Checklist

Hello reviewers! 👋 Please follow this checklist when reviewing this Pull Request.

General

  • Ensure that the Pull Request has a descriptive title.
  • If this is a change that users need to know about, please apply the release notes (needs details) label so that merging is blocked unless the summary release notes document is included.

If a new flag is being introduced:

  • Is it really necessary to add this flag?
  • Flag names should be clear and intuitive (as far as possible)
  • Help text should be descriptive.
  • Flag names should use dashes (-) as word separators rather than underscores (_).

If a workflow is added or modified:

  • Each item in Jobs should be named in order to mark it as required.
  • If the workflow should be required, the maintainer team should be notified.

Bug fixes

  • There should be at least one unit or end-to-end test.
  • The Pull Request description should include a link to an issue that describes the bug.

Non-trivial changes

  • There should be some code comments as to why things are implemented the way they are.

New/Existing features

  • Should be documented, either by modifying the existing documentation or creating new documentation.
  • New features should have a link to a feature request issue or an RFC that documents the use cases, corner cases and test cases.

Backward compatibility

  • Protobuf changes should be wire-compatible.
  • Changes to _vt tables and RPCs need to be backward compatible.
  • vtctl command output order should be stable and awk-able.
  • RPC changes should be compatible with vitess-operator
  • If a flag is removed, then it should also be removed from VTop, if used there.

@harshit-gangal
test: added failing e2e test
81c78b7 
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
@harshit-gangal
log txID and reserveID in stream execute
6b77091 
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
@harshit-gangal harshit-gangal changed the title [DNM] mysql restart - query list override issue Fix query list override issue on mysql restart Oct 3, 2022
@harshit-gangal
fix: maintain list of qd per key on the map and check for current con…
cb5e463 
…nection id while removing

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
@harshit-gangal harshit-gangal requested a review from deepthi October 3, 2022 14:58
@harshit-gangal harshit-gangal marked this pull request as ready for review October 3, 2022 14:59
deepthi
deepthi approved these changes Oct 3, 2022
View reviewed changes
Copy link
Collaborator

@deepthi deepthi left a comment

Choose a reason for hiding this comment

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

💯
A few more comments and then this should be good to merge.

@harshit-gangal
added additional comments
1a923a0 
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
@harshit-gangal
Merge remote-tracking branch 'upstream/main' into reconnect-miss
dd47ae9 
Signed-off-by: Harshit Gangal <harshit@planetscale.com>
@harshit-gangal harshit-gangal merged commit a31208f into vitessio:main Oct 4, 2022
@harshit-gangal harshit-gangal deleted the reconnect-miss branch October 4, 2022 11:09
@deepthi
Copy link
Collaborator

deepthi commented Oct 4, 2022

We are in the in-between state right now where release-15.0 branch has been created but is not yet open for back ports (until rc1 is released). When that opens up, we'll need to manually port this fix for release 15.

rsajwani pushed a commit to planetscale/vitess that referenced this pull request Oct 6, 2022
@harshit-gangal
Fix query list override issue on mysql restart (vitessio#11309) (vite…
2aaa300 
…ssio#1114)

* test: added failing e2e test

Signed-off-by: Harshit Gangal <harshit@planetscale.com>

* log txID and reserveID in stream execute

Signed-off-by: Harshit Gangal <harshit@planetscale.com>

* fix: maintain list of qd per key on the map and check for current connection id while removing

Signed-off-by: Harshit Gangal <harshit@planetscale.com>

* added additional comments

Signed-off-by: Harshit Gangal <harshit@planetscale.com>

Signed-off-by: Harshit Gangal <harshit@planetscale.com>

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
harshit-gangal added a commit to planetscale/vitess that referenced this pull request Oct 14, 2022
@harshit-gangal
Fix query list override issue on mysql restart (vitessio#11309)
c8f87b6 
* test: added failing e2e test

Signed-off-by: Harshit Gangal <harshit@planetscale.com>

* log txID and reserveID in stream execute

Signed-off-by: Harshit Gangal <harshit@planetscale.com>

* fix: maintain list of qd per key on the map and check for current connection id while removing

Signed-off-by: Harshit Gangal <harshit@planetscale.com>

* added additional comments

Signed-off-by: Harshit Gangal <harshit@planetscale.com>

Signed-off-by: Harshit Gangal <harshit@planetscale.com>
@harshit-gangal harshit-gangal mentioned this pull request Oct 14, 2022
Merged
harshit-gangal added a commit that referenced this pull request Oct 15, 2022
@harshit-gangal
Merge pull request #11506 from planetscale/15-cp-11309
1047f7e 
[15.0] Fix query list override issue on mysql restart (#11309)
@austenLacy austenLacy mentioned this pull request Apr 26, 2023
Merged
@austenLacy austenLacy mentioned this pull request Aug 1, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@systay systay Awaiting requested review from systay systay is a code owner

@shlomi-noach shlomi-noach Awaiting requested review from shlomi-noach shlomi-noach is a code owner

1 more reviewer

@deepthi deepthi deepthi approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Component: Query Serving Type: Bug

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@harshit-gangal @deepthi