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

executor: fix tiflash store information in cluster_info table #15871

Merged
merged 13 commits into from
Apr 2, 2020
Merged

executor: fix tiflash store information in cluster_info table #15871

merged 13 commits into from
Apr 2, 2020

Conversation

crazycs520
Copy link
Contributor

@crazycs520 crazycs520 commented Mar 30, 2020 •
edited by zz-jason
Loading

What problem does this PR solve?

Fix #15821.

When TiDB cluster with TiFlash node, the tiflash node information in cluster_info is wrong.

What is changed and how it works?

Fix cluster_info table information by getting all stores use PDClieng.GetAllStores.

This PR：

+---------+----------------+-----------------+------------------------------------------+------------------------------------------+---------------------------+------------+
| TYPE    | INSTANCE       | STATUS_ADDRESS  | VERSION                                  | GIT_HASH                                 | START_TIME                | UPTIME     |
+---------+----------------+-----------------+------------------------------------------+------------------------------------------+---------------------------+------------+
| tidb    | 127.0.0.1:8000 | 127.0.0.1:8500  | 5.7.25-TiDB-v4.0.0-beta.2-125-gce7e1e54c | ce7e1e54caa00510807ecf4a2fcef1ebdd34c822 | 2020-03-31T18:14:55+08:00 | 30.883977s |
| pd      | 127.0.0.1:6500 | 127.0.0.1:6500  | 4.1.0-alpha                              | f9243a07ab9558cf91f148aaef1d04159f7a509d | 2020-03-31T18:14:46+08:00 | 39.88398s  |
| tikv    | 127.0.0.1:7500 | 127.0.0.1:16500 | 4.1.0-alpha                              | bd296e5b17b9ea75db330557e1e5173930b17d51 | 2020-03-31T18:14:51+08:00 | 34.883982s |
| tiflash | 127.0.0.1:9500 |                 | 4.1.0-alpha                              |                                          |                           |            |
+---------+----------------+-----------------+------------------------------------------+------------------------------------------+---------------------------+------------+

Related changes

Tests

  • Unit test

Side effects

Release note

  • Fix Issue of tiflash store information in the cluster_info table was wrong.

@crazycs520
executor: fix store information in cluster_info table
2e591db 
Signed-off-by: crazycs520 <[email protected]>
@crazycs520
fix test
3864c4f 
Signed-off-by: crazycs520 <[email protected]>
@crazycs520
clean code
ce7e1e5 
Signed-off-by: crazycs520 <[email protected]>
@crazycs520 crazycs520 requested a review from a team as a code owner March 30, 2020 14:12
@ghost ghost requested review from wshwsh12 and removed request for a team March 30, 2020 14:12
@github-actions github-actions bot added the sig/sql-infra SIG: SQL Infra label Mar 30, 2020
@reafans
Copy link
Contributor

reafans commented Apr 1, 2020

LGTM

@crazycs520
Copy link
Contributor Author

/run-all-tests

@codecov
Copy link

codecov bot commented Apr 1, 2020 •
edited
Loading

Codecov Report

Merging #15871 into master will not change coverage by %.
The diff coverage is n/a.

@@             Coverage Diff             @@
##             master     #15871   +/-   ##
===========================================
  Coverage   80.4919%   80.4919%           
===========================================
  Files           506        506           
  Lines        135534     135534           
===========================================
  Hits         109094     109094           
  Misses        17932      17932           
  Partials       8508       8508

lzmhhh123
lzmhhh123 approved these changes Apr 1, 2020
View reviewed changes
Copy link
Contributor

@lzmhhh123 lzmhhh123 left a comment

Choose a reason for hiding this comment

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

LGTM

@lzmhhh123
Copy link
Contributor

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 1, 2020
@lzmhhh123 lzmhhh123 added needs-cherry-pick-4.0 status/LGT2 Indicates that a PR has LGTM 2. labels Apr 1, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Apr 1, 2020

/run-all-tests

@sre-bot
Copy link
Contributor

sre-bot commented Apr 1, 2020

@crazycs520 merge failed.

@crazycs520
Copy link
Contributor Author

/run-unit-test

@crazycs520
Copy link
Contributor Author

/run-unit-test

@crazycs520 crazycs520 merged commit b02badc into pingcap:master Apr 2, 2020
sre-bot pushed a commit to sre-bot/tidb that referenced this pull request Apr 2, 2020
@crazycs520 @sre-bot
executor: fix tiflash store information in cluster_info table (pingca…
8df99c8 
…p#15871)
@sre-bot sre-bot mentioned this pull request Apr 2, 2020
Merged
@sre-bot
Copy link
Contributor

sre-bot commented Apr 2, 2020

cherry pick to release-4.0 in PR #16024

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

@lzmhhh123 lzmhhh123 lzmhhh123 approved these changes

@wshwsh12 wshwsh12 Awaiting requested review from wshwsh12

Assignees
No one assigned
Labels
sig/execution SIG execution sig/sql-infra SIG: SQL Infra status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

cluster_info for TiFlash is not correct
4 participants
@crazycs520 @reafans @lzmhhh123 @sre-bot