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

[v15.0.5]: Backport upstream 13856 - reshard state check fix #322

Open
wants to merge 4 commits into
base: slack-15.0
Choose a base branch
from
Open

[v15.0.5]: Backport upstream 13856 - reshard state check fix #322

wants to merge 4 commits into from

Conversation

tanjinx
Copy link
Collaborator

@tanjinx tanjinx commented Apr 30, 2024 •
edited

Description

backport vitessio#13856
fixing confusing resharding message https://jira.tinyspeck.com/browse/DRE-9167

Fatal MySQL error: DB-vitess: ERUnknownError 1105 target: pool1.-80.primary: current keyspace is being resharded

And need another one vitessio#13010 for the missing null pointer check.

v14.0.5 backport #321

Related Issue(s)

Checklist

  • "Backport to:" labels have been added if this change should be back-ported
  • Tests were added or are not required
  • Did the new or modified tests pass consistently locally and on the CI
  • Documentation was added or is not required

Deployment Notes

@tanjinx tanjinx requested a review from a team as a code owner April 30, 2024 19:45
@github-actions github-actions bot added this to the v15.0.5 milestone Apr 30, 2024
@tanjinx
fix null check
3f95808 
Signed-off-by: 'Tanjin Xu' <tanjin.xu@slack-corp.com>
@tanjinx
remove empty line
4fab3d5 
Signed-off-by: 'Tanjin Xu' <tanjin.xu@slack-corp.com>
@timvaillancourt
Copy link
Member

@tanjinx this PR is including the git state of the upstream PR

How did you do the backport and is it possible to use git cherry-pick -m 1 <merge SHA> so we keep v15 consistent with git history?

@timvaillancourt timvaillancourt self-requested a review May 4, 2024 12:04
timvaillancourt
timvaillancourt requested changes May 4, 2024
View reviewed changes
Copy link
Member

@timvaillancourt timvaillancourt left a comment

Choose a reason for hiding this comment

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

Left comment about git history/backport method

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@timvaillancourt timvaillancourt timvaillancourt requested changes

@vmogilev vmogilev vmogilev approved these changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
v15-backport v15
Projects
None yet
Milestone
v15.0.5
3 participants
@tanjinx @timvaillancourt @vmogilev