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

config: refine config clone #3116

Merged
merged 5 commits into from
Oct 29, 2020
Merged

config: refine config clone #3116

merged 5 commits into from
Oct 29, 2020

Conversation

HunDunDM
Copy link
Member

What problem does this PR solve?

  • The config of store-balance-rate and trace-region-flow will be lost during Clone.

What is changed and how it works?

  • config: refine config clone
  • server: clone config in GetConfig

Check List

Related changes

  • Need to cherry-pick to the release branch

Release note

  • Fix the bug that trace-region-flow will be accidentally changed to false.

@HunDunDM
config: refine config clone
dcdce96 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
@HunDunDM
clone config in GetConfig
2cdcb4f 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
@HunDunDM HunDunDM added component/config Configuration logic. type/bugfix This PR fixes a bug. needs-cherry-pick-release-4.0 The PR needs to cherry pick to release-4.0 branch. labels Oct 28, 2020
@HunDunDM HunDunDM self-assigned this Oct 28, 2020
@nolouch
Copy link
Contributor

nolouch commented Oct 28, 2020

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Oct 28, 2020
Yisaer
Yisaer reviewed Oct 28, 2020
View reviewed changes
Copy link
Contributor

@Yisaer Yisaer left a comment

Choose a reason for hiding this comment

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

Basically LGTM. Can you add unit test to verify it?

@ti-srebot ti-srebot removed the status/LGT1 Indicates that a PR has LGTM 1. label Oct 28, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Oct 28, 2020
@HunDunDM
add test
1c17c4d 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
nolouch
nolouch reviewed Oct 28, 2020
View reviewed changes
Copy link
Contributor

@nolouch nolouch left a comment

Choose a reason for hiding this comment

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

LGTM

rleungx
rleungx approved these changes Oct 29, 2020
View reviewed changes
Copy link
Member

@rleungx rleungx left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-srebot ti-srebot added status/LGT3 The PR has already had 3 LGTM. and removed status/LGT2 Indicates that a PR has LGTM 2. labels Oct 29, 2020
@rleungx
Copy link
Member

rleungx commented Oct 29, 2020

CI failed due to SetStoreLimit

@HunDunDM
fix nil map
a12734d 
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
@HunDunDM
Copy link
Member Author

/run-all-tests

@nolouch
Copy link
Contributor

nolouch commented Oct 29, 2020

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Oct 29, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@HunDunDM merge failed.

@HunDunDM
Copy link
Member Author

/merge

@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot ti-srebot merged commit 90a24a9 into tikv:master Oct 29, 2020
ti-srebot pushed a commit to ti-srebot/pd that referenced this pull request Oct 29, 2020
@HunDunDM @ti-srebot
cherry pick tikv#3116 to release-4.0
54c57cd 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot ti-srebot mentioned this pull request Oct 29, 2020
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #3120

@HunDunDM HunDunDM deleted the clone branch October 29, 2020 07:17
ti-srebot added a commit that referenced this pull request Nov 2, 2020
@ti-srebot
config: refine config clone (#3116) (#3120)
f9ce6a0 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: Zheng Xiangsheng <hundundm@gmail.com>
@HunDunDM HunDunDM mentioned this pull request Dec 2, 2020
Closed
@HunDunDM HunDunDM mentioned this pull request Jan 22, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Yisaer Yisaer Yisaer left review comments

@nolouch nolouch nolouch left review comments

@ti-srebot ti-srebot ti-srebot approved these changes

@rleungx rleungx rleungx approved these changes

@lhy1024 lhy1024 lhy1024 approved these changes

Assignees

@HunDunDM HunDunDM

Labels
component/config Configuration logic. needs-cherry-pick-release-4.0 The PR needs to cherry pick to release-4.0 branch. status/can-merge Indicates a PR has been approved by a committer. status/LGT3 The PR has already had 3 LGTM. type/bugfix This PR fixes a bug.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@HunDunDM @nolouch @rleungx @ti-srebot @Yisaer @lhy1024