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.

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

fix pd and tikv concurrent update #234

Merged
merged 8 commits into from
Dec 24, 2018

Conversation

xiaojingchen
Copy link
Contributor

this PR fixes #232 #144

Copy link
Contributor

@weekface weekface left a comment

Choose a reason for hiding this comment

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

Must add unit tests to cover these situations.

@xiaojingchen xiaojingchen changed the title fix pd and tikv concurrent update [WIP] fix pd and tikv concurrent update Dec 17, 2018
@xiaojingchen xiaojingchen changed the title [WIP] fix pd and tikv concurrent update fix pd and tikv concurrent update Dec 21, 2018
@weekface
Copy link
Contributor

/run-e2e-tests

@xiaojingchen
Copy link
Contributor Author

/run-e2e-tests

@xiaojingchen
Copy link
Contributor Author

/run-e2e-tests

Copy link
Member

@tennix tennix left a comment

Choose a reason for hiding this comment

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

LGTM

@xiaojingchen xiaojingchen merged commit d29d1ad into pingcap:master Dec 24, 2018
yahonda pushed a commit that referenced this pull request Dec 27, 2021
* Update monitor-using-tidbmonitor.md

* fix lint

* Update zh/monitor-using-tidbmonitor.md

Co-authored-by: Ran <huangran@pingcap.com>

* address the comment

* Apply suggestions from code review

Co-authored-by: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com>

Co-authored-by: Ran <huangran@pingcap.com>
Co-authored-by: DanielZhangQD <36026334+DanielZhangQD@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

pd and tikv happended concurrent upgrading at some times
3 participants