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

Make tikv-ctl used via relative path when encryption is enabled (#7936) #7963

Merged
merged 2 commits into from Jun 4, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented May 29, 2020

cherry-pick #7936 to release-4.0


Signed-off-by: TXXT hunterlxt@live.com

What problem does this PR solve?

close #7886

Problem Summary:
relative path cannot be key in encryption dictionary, let's canonicalize it.

What is changed and how it works?

canonicalize kv_path and raft_path

Related changes

None

Check List

Tests

  • Manual test (add detailed scripts or steps below)

Side effects

No

Release note

  • Fix bug where tikv-ctl does not support relative path

@sre-bot
Copy link
Contributor Author

sre-bot commented May 29, 2020

/run-all-tests

@hunterlxt
Copy link
Member

/run-all-tests

@hunterlxt
Copy link
Member

@zhouqiang-cl PTAL DCO bot may don't work correctly

Signed-off-by: Xintao <hunterlxt@live.com>
@hunterlxt
Copy link
Member

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 4, 2020

Sorry @hunterlxt, you don't have permission to trigger auto merge event on this branch.

@hunterlxt
Copy link
Member

/run-all-tests

@zhouqiang-cl
Copy link
Contributor

/merge

@sre-bot sre-bot added the status/can-merge Status: Can merge to base branch label Jun 4, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 4, 2020

/run-all-tests

@sre-bot sre-bot merged commit 70b77f7 into tikv:release-4.0 Jun 4, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status/can-merge Status: Can merge to base branch type/bugfix Type: PR - Fix a bug type/cherry-pick Type: PR - Cherry pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants