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) #16024

Merged
merged 10 commits into from
Apr 15, 2020
Merged

executor: fix tiflash store information in cluster_info table (#15871) #16024

merged 10 commits into from
Apr 15, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Apr 2, 2020

cherry-pick #15871 to release-4.0

What problem does this PR solve?

Fix Issue #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.

@sre-bot sre-bot requested a review from a team as a code owner April 2, 2020 14:21
@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 2, 2020

/run-all-tests

@sre-bot sre-bot mentioned this pull request Apr 2, 2020
Merged
@ghost ghost requested a review from qw4990 April 2, 2020 14:21
zz-jason
zz-jason reviewed Apr 3, 2020
View reviewed changes
Copy link
Member

@zz-jason zz-jason left a comment

Choose a reason for hiding this comment

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

@crazycs520 please fix the build failure:

[2020-04-02T14:21:52.568Z] infoschema/tables.go:1023:17: undefined: helper

[2020-04-02T14:21:52.568Z] infoschema/tables.go:1046:37: undefined: helper

[2020-04-02T14:21:52.568Z] infoschema/tables.go:1077:17: undefined: helper

[2020-04-02T14:21:52.568Z] make: *** [importer] Error 2

[2020-04-02T14:21:53.133Z] # github.com/pingcap/tidb/infoschema

[2020-04-02T14:21:53.133Z] infoschema/tables.go:1023:17: undefined: helper

[2020-04-02T14:21:53.133Z] infoschema/tables.go:1046:37: undefined: helper

[2020-04-02T14:21:53.133Z] infoschema/tables.go:1077:17: undefined: helper

[2020-04-02T14:21:53.133Z] # github.com/pingcap/tidb/infoschema

[2020-04-02T14:21:53.133Z] infoschema/tables.go:1023:17: undefined: helper

[2020-04-02T14:21:53.133Z] infoschema/tables.go:1046:37: undefined: helper

[2020-04-02T14:21:53.133Z] infoschema/tables.go:1077:17: undefined: helper

@crazycs520
Copy link
Contributor

/run-all-tests

@reafans
Copy link
Contributor

reafans commented Apr 15, 2020

LGTM

lzmhhh123
lzmhhh123 approved these changes Apr 15, 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 lzmhhh123 added the status/LGT2 Indicates that a PR has LGTM 2. label Apr 15, 2020
@zz-jason zz-jason added the status/can-merge Indicates a PR has been approved by a committer. label Apr 15, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 15, 2020

Your auto merge job has been accepted, waiting for 16372

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 15, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 15, 2020

@sre-bot merge failed.

@zz-jason
Copy link
Member

/run-integration-common-test

@zz-jason zz-jason merged commit e00fd2c into pingcap:release-4.0 Apr 15, 2020
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

@zz-jason zz-jason zz-jason approved these changes

Assignees

@crazycs520 crazycs520

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. type/4.0-cherry-pick
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@sre-bot @crazycs520 @reafans @zz-jason @lzmhhh123