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

compatible with the old version and take effect of dispatch and causality #915

Merged
merged 6 commits into from
Mar 4, 2020
Merged

compatible with the old version and take effect of dispatch and causality #915

merged 6 commits into from
Mar 4, 2020

Conversation

july2993
Copy link
Contributor

What problem does this PR solve?

What is changed and how it works?

  • add more field for compatible the disable* config, if the old one(disable one) is set, the old one takes effect.
  • add option EnableDispatch and EnableCausality for pkg/Loader

Check List

Tests

  • Unit test

Code changes

Side effects

Related changes

  • Need to be included in the release note

WangXiangUSTC
WangXiangUSTC reviewed Feb 28, 2020
View reviewed changes
Copy link
Contributor

@WangXiangUSTC WangXiangUSTC left a comment

Choose a reason for hiding this comment

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

rest LGTM

drainer/config.go
// if both setted, the disable one take affect.
DisableDispatchFlag *bool `toml:"disable-dispatch-flag" json:"disable-dispatch-flag"`
EnableDispatchFlag *bool `toml:"enable-dispatch-flag" json:"enable-dispatch-flag"`
DisableDispatchFile *bool `toml:"disable-dispatch" json:"disable-dispatch"`
Copy link
Contributor

Choose a reason for hiding this comment

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

how about use these configs in integration test

Copy link
Contributor Author

Choose a reason for hiding this comment

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

add in 505451b

@WangXiangUSTC
Copy link
Contributor

LGTM

@july2993
Copy link
Contributor Author

july2993 commented Mar 2, 2020

@GregoryIan PTAL

@WangXiangUSTC
Copy link
Contributor

/run-all-tests

@july2993
Copy link
Contributor Author

july2993 commented Mar 2, 2020

/run-unit-test
the unstable test will fixed in #918

@IANTHEREAL
Copy link
Collaborator

@csuzhangxc PTAL

@csuzhangxc
Copy link
Member

I'll task a look later today.

csuzhangxc
csuzhangxc reviewed Mar 3, 2020
View reviewed changes
Copy link
Member

@csuzhangxc csuzhangxc left a comment

Choose a reason for hiding this comment

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

rest LGTM

drainer/config.go Outdated Show resolved Hide resolved
pkg/loader/load.go Show resolved Hide resolved
csuzhangxc
csuzhangxc approved these changes Mar 3, 2020
View reviewed changes
Copy link
Member

@csuzhangxc csuzhangxc left a comment

Choose a reason for hiding this comment

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

LGTM

@july2993
Copy link
Contributor Author

july2993 commented Mar 3, 2020

/run-all-tests

@july2993 july2993 merged commit 649ec60 into pingcap:master Mar 4, 2020
@july2993 july2993 deleted the dis branch March 4, 2020 02:52
@sre-bot
Copy link

sre-bot commented Mar 4, 2020

cherry pick to release-3.0 failed

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

@csuzhangxc csuzhangxc csuzhangxc approved these changes

@IANTHEREAL IANTHEREAL Awaiting requested review from IANTHEREAL

@WangXiangUSTC WangXiangUSTC Awaiting requested review from WangXiangUSTC

Assignees
No one assigned
Labels
needs-cherry-pick-release-3.0 status/LGT2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

drainer flag compatible with the old version
5 participants
@july2993 @WangXiangUSTC @IANTHEREAL @csuzhangxc @sre-bot