tools: fix TLS in pd control by rleungx · Pull Request #1729 · tikv/pd

rleungx · 2019-09-04T09:34:51Z

What problem does this PR solve?

For now, pd-ctl cannot work when enable the TLS option.

What is changed and how it works?

This PR fixes this problem by adding ParseFlags back.

Check List

Tests

Unit test

Related changes

Need to cherry-pick to the release branch
Need to be included in the release notes

Signed-off-by: Ryan Leung <rleungx@gmail.com>

sre-bot · 2019-09-05T11:07:56Z

/run-all-tests

codecov-io · 2019-09-05T11:15:44Z

Codecov Report

Merging #1729 into master will increase coverage by 0.05%.
The diff coverage is 100%.

@@            Coverage Diff            @@
##           master   #1729      +/-   ##
=========================================
+ Coverage   76.85%   76.9%   +0.05%     
=========================================
  Files         160     160              
  Lines       15730   15731       +1     
=========================================
+ Hits        12089   12098       +9     
+ Misses       2624    2612      -12     
- Partials     1017    1021       +4

Impacted Files	Coverage Δ
tools/pd-ctl/pdctl/ctl.go	`94.87% <100%> (+10.66%)`	⬆️
pkg/etcdutil/etcdutil.go	`76.81% <0%> (-11.6%)`	⬇️
client/client.go	`65.77% <0%> (-1.24%)`	⬇️
server/member/leader.go	`75.51% <0%> (-1.03%)`	⬇️
server/grpc_service.go	`58.78% <0%> (-0.44%)`	⬇️
server/schedule/operator/operator.go	`85.58% <0%> (+0.54%)`	⬆️
server/tso/tso.go	`81.65% <0%> (+2.75%)`	⬆️
server/region_syncer/client.go	`81.01% <0%> (+3.79%)`	⬆️
server/schedulers/shuffle_hot_region.go	`65.38% <0%> (+6.41%)`	⬆️
tools/pd-ctl/pdctl/command/global.go	`66.66% <0%> (+7.61%)`	⬆️
... and 1 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 38ff102...450c23e. Read the comment docs.

sre-bot · 2019-09-05T11:16:14Z

cherry pick to release-3.0 failed

Signed-off-by: Ryan Leung <rleungx@gmail.com>

* *: unify get store function everywhere (#1671) Signed-off-by: Ryan Leung <rleungx@gmail.com> * remove unnecessary parentheses * server: use leader lease to determine tso service validity (#1676) Signed-off-by: disksing <i@disksing.com> * change internal stat values to float64 * add pending operator influence * add metrics of pending influence * fix metrics * fix panic * adjust pending influence of balanceHotWrite * change weight of pending influence * test: fix tests (#1696) * test: fix region syncer test Signed-off-by: disksing <i@disksing.com> * decrease region rolling window; store pending influence in scheduler * add config-check flag for pd-server (#1695) Signed-off-by: cwen0 <cwenyin0@gmail.com> * decrease possiblility transfer hot write leader * change pending influence weight * add unstarted op metrics * add logs for debug * add log for debug * add logs for debug * add logs for debug * add logs for debug * add logs for debug * add logs for debug * add logs for debug * Revert "add logs for debug" This reverts commit e74c7a9. * add metrics for hotspot operators * operator: rewrite move region related functions (#1667) * add metrics for pending operators * *: support setting endKey for ScanRange (#1700) Signed-off-by: disksing <i@disksing.com> * fix bug * fix bug * fix bug * fix metrics thread-safe bug * fix logic bug * *: reduce some unnecessary parameters (#1698) Signed-off-by: Ryan Leung <rleungx@gmail.com> * schedule: Do not send an operator of a region wth a stale epoch (#1659) * schedule: Do not send an operator of a region wth a stale epoch Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * schedule: check the version changed by the operator self Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * schedule: fix unit test Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * schedule: fix to avoid dispatching a stale opstep Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * dispatch: refactor "ConsumeConfVer() int" to "ExpectConfVerChange() bool" Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * dispatch: fix typo in comment Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * fix typo Co-Authored-By: Ryan Leung <rleungx@gmail.com> * dispatch: fix unittest Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * dispatch: refine format Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * server: fix the dead lock in scatter region (#1706) Signed-off-by: Ryan Leung <rleungx@gmail.com> * add drop time for operator * use IsDropped to recognize canceled ops * try to fix trans leader burst * try to fix trans leader burst * add zombie influence * change select src dst strategy; improve op_controller * change select src strategy * fix bug * tools: fix set namespace in pd-ctl (#1701) Signed-off-by: Ryan Leung <rleungx@gmail.com> * tools: fix parse url without http prefix (#1703) Signed-off-by: Ryan Leung <rleungx@gmail.com> * tests: support deadlock detection in make test (#1704) Signed-off-by: Ryan Leung <rleungx@gmail.com> * Makefile: fix failpoint enable (#1722) Signed-off-by: nolouch <nolouch@gmail.com> * checker: fix the issue that a region does not merge to the sibling with smaller size (#1723) Signed-off-by: disksing <i@disksing.com> * tools: balance region simulator (#1708) * scheduler: do not remove the operator when the step does not finish (#1715) Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * operator: fix the AddLearner config version judgment (#1732) Signed-off-by: nolouch <nolouch@gmail.com> * tools: fix TLS in pd control (#1729) Signed-off-by: Ryan Leung <rleungx@gmail.com> * syncer: support TLS for region syncer (#1728) Signed-off-by: Ryan Leung <rleungx@gmail.com> * schedule: fix a thread-safe bug and improve code (#1719)

Signed-off-by: Ryan Leung <rleungx@gmail.com>

* *: unify get store function everywhere (#1671) Signed-off-by: Ryan Leung <rleungx@gmail.com> * server: use leader lease to determine tso service validity (#1676) Signed-off-by: disksing <i@disksing.com> * test: fix tests (#1696) * test: fix region syncer test Signed-off-by: disksing <i@disksing.com> * add config-check flag for pd-server (#1695) Signed-off-by: cwen0 <cwenyin0@gmail.com> * operator: rewrite move region related functions (#1667) * *: support setting endKey for ScanRange (#1700) Signed-off-by: disksing <i@disksing.com> * *: reduce some unnecessary parameters (#1698) Signed-off-by: Ryan Leung <rleungx@gmail.com> * schedule: Do not send an operator of a region wth a stale epoch (#1659) * schedule: Do not send an operator of a region wth a stale epoch Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * schedule: check the version changed by the operator self Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * schedule: fix unit test Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * schedule: fix to avoid dispatching a stale opstep Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * dispatch: refactor "ConsumeConfVer() int" to "ExpectConfVerChange() bool" Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * dispatch: fix typo in comment Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * fix typo Co-Authored-By: Ryan Leung <rleungx@gmail.com> * dispatch: fix unittest Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * dispatch: refine format Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * server: fix the dead lock in scatter region (#1706) Signed-off-by: Ryan Leung <rleungx@gmail.com> * tools: fix set namespace in pd-ctl (#1701) Signed-off-by: Ryan Leung <rleungx@gmail.com> * tools: fix parse url without http prefix (#1703) Signed-off-by: Ryan Leung <rleungx@gmail.com> * tests: support deadlock detection in make test (#1704) Signed-off-by: Ryan Leung <rleungx@gmail.com> * Makefile: fix failpoint enable (#1722) Signed-off-by: nolouch <nolouch@gmail.com> * checker: fix the issue that a region does not merge to the sibling with smaller size (#1723) Signed-off-by: disksing <i@disksing.com> * tools: balance region simulator (#1708) * scheduler: do not remove the operator when the step does not finish (#1715) Signed-off-by: Shafreeck Sea <shafreeck@gmail.com> * operator: fix the AddLearner config version judgment (#1732) Signed-off-by: nolouch <nolouch@gmail.com> * tools: fix TLS in pd control (#1729) Signed-off-by: Ryan Leung <rleungx@gmail.com> * syncer: support TLS for region syncer (#1728) Signed-off-by: Ryan Leung <rleungx@gmail.com> * schedule: fix a thread-safe bug and improve code (#1719) * statistics: fix region flow calculation (#1688) Signed-off-by: jiyingtk <jiyingtk@mail.ustc.edu.cn> * makefile: improve deadlock-enable/disable (#1736) * api: fix missing keys statistic in region information (#1741) Signed-off-by: nolouch <nolouch@gmail.com> * *: update go version to 1.13 (#1742) Signed-off-by: disksing <i@disksing.com> * coordinator: add the operator cost time in log field (#1748) Signed-off-by: nolouch <nolouch@gmail.com>

rleungx added area/pdctl needs-cherry-pick-release-3.0 The PR needs to cherry pick to release-3.0 branch. labels Sep 4, 2019

fix TLS in pd control

98bf47e

Signed-off-by: Ryan Leung <rleungx@gmail.com>

rleungx force-pushed the fix-tls branch from 6d16eb6 to 98bf47e Compare September 4, 2019 09:36

rleungx requested review from Connor1996, disksing and nolouch September 5, 2019 05:17

shafreeck approved these changes Sep 5, 2019

View reviewed changes

nolouch approved these changes Sep 5, 2019

View reviewed changes

nolouch added the status/can-merge Indicates a PR has been approved by a committer. label Sep 5, 2019

Merge branch 'master' into fix-tls

450c23e

sre-bot mentioned this pull request Sep 5, 2019

syncer: support TLS for region syncer #1728

Merged

sre-bot merged commit ca5cae6 into tikv:master Sep 5, 2019

rleungx added a commit to rleungx/pd that referenced this pull request Sep 9, 2019

tools: fix TLS in pd control (tikv#1729)

61fb4a4

Signed-off-by: Ryan Leung <rleungx@gmail.com>

rleungx mentioned this pull request Sep 9, 2019

tools: fix TLS in pd control (#1729) #1738

Merged

sre-bot pushed a commit that referenced this pull request Sep 9, 2019

tools: fix TLS in pd control (#1729) (#1738)

0945672

Signed-off-by: Ryan Leung <rleungx@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

tools: fix TLS in pd control#1729

tools: fix TLS in pd control#1729
sre-bot merged 2 commits into
tikv:masterfrom
rleungx:fix-tls

rleungx commented Sep 4, 2019

Uh oh!

sre-bot commented Sep 5, 2019

Uh oh!

codecov-io commented Sep 5, 2019

Uh oh!

sre-bot commented Sep 5, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

rleungx commented Sep 4, 2019

What problem does this PR solve?

What is changed and how it works?

Check List

Uh oh!

sre-bot commented Sep 5, 2019

Uh oh!

codecov-io commented Sep 5, 2019

Codecov Report

Uh oh!

sre-bot commented Sep 5, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants