infoschema: fix tidb version showed in cluster_info table and update the go.mod for new sysutil #16003

reafans · 2020-04-02T05:51:22Z

What problem does this PR solve?

The version of TiDB is not consistent with TiKV and PD.

What is changed and how it works?

Proposal: xxx

What's Changed:
before:

+------+-----------------+-----------------+----------------------------------------+------------------------------------------+---------------------------+--------------------+
| TYPE | INSTANCE        | STATUS_ADDRESS  | VERSION                                | GIT_HASH                                 | START_TIME
          | UPTIME             |
+------+-----------------+-----------------+----------------------------------------+------------------------------------------+---------------------------+--------------------+
| tidb | 0.0.0.0:4000    | 0.0.0.0:10080   | 5.7.25-TiDB-v4.0.0-beta-613-gaa7ef9c46 | aa7ef9c46435bb20d42fa0badcf09fc16f9609a9 | 2020-04-02T15:35:56+08:00 | 8.410056522s       |
| pd   | 127.0.0.1:2379  | 127.0.0.1:2379  | 4.0.0-beta.2                           | 7ebad5232e7df681d8d425900f52984574539568 | 2020-04-02T10:15:36+08:00 | 5h20m28.410060208s |
| tikv | 127.0.0.1:20160 | 127.0.0.1:20180 | 4.0.0-beta.2                           | 7908f6e6699239fff23daa444961b5a47ff659da | 2020-04-02T10:15:49+08:00 | 5h20m15.410061844s |
+------+-----------------+-----------------+----------------------------------------+------------------------------------------+---------------------------+--------------------+

this pr : not set the serverVersion, use select Version() would get the default version. And CLUSTER_INFO would get the format version.

mysql root@localhost:INFORMATION_SCHEMA> select Version()
+----------------------------------------------+
| Version()                                    |
+----------------------------------------------+
| 5.7.25-TiDB-v4.0.0-beta-630-g91effa93d-dirty |
+----------------------------------------------+
1 row in set
Time: 0.030s

mysql root@localhost:INFORMATION_SCHEMA> select * from `CLUSTER_INFO`
+------+-----------------+-----------------+--------------+------------------------------------------+---------------------------+--------------------+
| TYPE | INSTANCE        | STATUS_ADDRESS  | VERSION      | GIT_HASH                                 | START_TIME                | UPTIME             |
+------+-----------------+-----------------+--------------+------------------------------------------+---------------------------+--------------------+
| tidb | 0.0.0.0:4000    | 0.0.0.0:10080   | 4.0.0-beta   | 91effa93d86cf0bb7545e9d59f6a1767b1bfdce5 | 2020-04-07T21:21:18+08:00 | 1m39.481884397s    |
| pd   | 127.0.0.1:2379  | 127.0.0.1:2379  | 4.0.0-beta.2 | 7ebad5232e7df681d8d425900f52984574539568 | 2020-04-07T11:59:11+08:00 | 9h23m46.481888567s |
| tikv | 127.0.0.1:20160 | 127.0.0.1:20180 | 4.0.0-beta.2 | 7908f6e6699239fff23daa444961b5a47ff659da | 2020-04-07T11:59:31+08:00 | 9h23m26.48189004s  |
+------+-----------------+-----------------+--------------+------------------------------------------+---------------------------+--------------------+
3 rows in set
Time: 0.033s

When set the serverVersion to "8.0.1" in config.toml, select Version() and CLUSTER_INFO would get the version which user set:

mysql root@localhost:INFORMATION_SCHEMA> select Version()
+-----------+
| Version() |
+-----------+
| 8.0.1     |
+-----------+
1 row in set
Time: 0.033s

mysql root@localhost:INFORMATION_SCHEMA> select * from `CLUSTER_INFO`
+------+-----------------+-----------------+--------------+------------------------------------------+---------------------------+--------------------+
| TYPE | INSTANCE        | STATUS_ADDRESS  | VERSION      | GIT_HASH                                 | START_TIME                | UPTIME             |
+------+-----------------+-----------------+--------------+------------------------------------------+---------------------------+--------------------+
| tidb | 0.0.0.0:4000    | 0.0.0.0:10080   | 8.0.1        | None                                     | 2020-04-07T21:25:55+08:00 | 59.239367762s      |
| pd   | 127.0.0.1:2379  | 127.0.0.1:2379  | 4.0.0-beta.2 | 7ebad5232e7df681d8d425900f52984574539568 | 2020-04-07T11:59:11+08:00 | 9h27m43.239373343s |
| tikv | 127.0.0.1:20160 | 127.0.0.1:20180 | 4.0.0-beta.2 | 7908f6e6699239fff23daa444961b5a47ff659da | 2020-04-07T11:59:31+08:00 | 9h27m23.239374837s |
+------+-----------------+-----------------+--------------+------------------------------------------+---------------------------+--------------------+
3 rows in set

How it Works:

Check List

Tests

Unit test

CLAassistant · 2020-04-02T05:51:26Z

All committers have signed the CLA.

reafans · 2020-04-02T06:29:20Z

/run-unit-test

…b_version

codecov · 2020-04-02T07:43:25Z

Codecov Report

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

@@             Coverage Diff             @@
##             master     #16003   +/-   ##
===========================================
  Coverage   80.3136%   80.3136%           
===========================================
  Files           506        506           
  Lines        136226     136226           
===========================================
  Hits         109408     109408           
  Misses        18301      18301           
  Partials       8517       8517

…to fix_tidb_version

Deardrops

LGTM

Deardrops · 2020-04-07T02:57:39Z

infoschema/tables.go

+// FormatVersion make TiDBVersion consistent to TiKV and PD.
+func FormatVersion(TiDBVersion string) string {
+	var version string
+	nodeVersion := TiDBVersion[strings.LastIndex(TiDBVersion, "TiDB-")+len("TiDB-"):]


Check len(TiDBVersion) > n before use

+1.

Since the TiDBVersion maybe equal the config ServerVersion, Add more case for this, such as xxx

Test it need change the serverVersion config, so test it locally and show the result in introduction.

When not set the serverVersion, it would use the default version, and format it in cluster_info.

When the user set the serverVersion(this would hardly happend), it would use the serverVersion and not do the format.

…to fix_tidb_version

reafans · 2020-04-09T03:16:49Z

/run-check_dev_2

…to fix_tidb_version

zimulala

LGTM

sre-bot · 2020-04-09T03:32:42Z

Your auto merge job has been accepted, waiting for 16219, 16138

zimulala · 2020-04-09T03:40:49Z

infoschema/tables.go

+
+	// The user hasn't set the config 'ServerVersion'.
+	if isDefaultVersion {
+		nodeVersion = TiDBVersion[strings.LastIndex(TiDBVersion, "TiDB-")+len("TiDB-"):]


Is there a scenario where "TiDBVersion" is not the default format, but "isDefaultVersion" is true?

No，this would be never happened，because the "TiDBVersion" also comes from mysql.ServerVersion， and when the user not set the serverVersion，the mysql.ServerVersion would be the default version which make isDefaultVersion become true.

OK. I see node.Version is come from ServerInfo so ask this question.

sre-bot · 2020-04-09T03:50:41Z

/run-all-tests

reafans · 2020-04-09T04:19:32Z

/merge

sre-bot · 2020-04-09T04:19:35Z

Your auto merge job has been accepted, waiting for 16142, 16139, 16137, 16204

sre-bot · 2020-04-09T04:43:11Z

/run-all-tests

sre-bot · 2020-04-09T04:46:39Z

@reafans merge failed.

reafans · 2020-04-09T05:27:59Z

/run-integration-copr-test

reafans · 2020-04-09T05:32:00Z

/run-integration-copr-test tikv=pr/7383

reafans · 2020-04-09T05:36:48Z

/run-check_dev_2

reafans · 2020-04-09T05:39:08Z

/merge

sre-bot · 2020-04-09T05:39:38Z

/run-all-tests

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot · 2020-07-07T07:58:59Z

cherry pick to release-4.0 in PR #18413

…the go.mod for new sysutil (#16003) (#18413) Signed-off-by: ti-srebot <ti-srebot@pingcap.com> Signed-off-by: crazycs520 <crazycs520@gmail.com>

fix tidb version

9debac7

reafans requested a review from a team as a code owner April 2, 2020 05:51

ghost requested review from qw4990 and removed request for a team April 2, 2020 05:51

github-actions bot added sig/sql-infra SIG: SQL Infra sig/execution SIG execution labels Apr 2, 2020

reafans and others added 3 commits April 2, 2020 13:57

fmt

5ecb2fd

add UT

2ad26aa

Merge branch 'master' into fix_tidb_version

a67f4ca

reafans changed the title ~~infoschema: fix tidb version showed in cluster_info table.~~ infoschema: fix tidb version showed in cluster_info table and update the go.mod for new sysutil Apr 2, 2020

reafans and others added 2 commits April 2, 2020 15:29

Merge branch 'master' of https://github.com/pingcap/tidb into fix_tid…

fa0baa3

…b_version

Merge branch 'master' into fix_tidb_version

a6484f2

reafans and others added 3 commits April 2, 2020 15:56

Merge branch 'fix_tidb_version' of https://github.com/reafans/tidb in…

6507aff

…to fix_tidb_version

refine

a7410b4

Merge branch 'master' into fix_tidb_version

5f7d091

Deardrops reviewed Apr 7, 2020

View reviewed changes

Deardrops added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 7, 2020

Deardrops reviewed Apr 7, 2020

View reviewed changes

Deardrops removed the status/LGT1 Indicates that a PR has LGTM 1. label Apr 7, 2020

reafans added 2 commits April 7, 2020 19:27

address comment

7e07999

Merge branch 'fix_tidb_version' of https://github.com/reafans/tidb in…

88a502c

…to fix_tidb_version

github-actions bot added the component/config label Apr 7, 2020

fix UT

d6ec54f

reafans removed the component/config label Apr 7, 2020

reafans added 3 commits April 7, 2020 20:29

refine UT

2755881

fix UT

4c6106a

refine

91effa9

reafans added 2 commits April 9, 2020 11:25

remove mod

af483dd

Merge branch 'fix_tidb_version' of https://github.com/reafans/tidb in…

033e83b

…to fix_tidb_version

zimulala reviewed Apr 9, 2020

View reviewed changes

zimulala approved these changes Apr 9, 2020

View reviewed changes

zimulala added the status/can-merge Indicates a PR has been approved by a committer. label Apr 9, 2020

zimulala added the status/LGT2 Indicates that a PR has LGTM 2. label Apr 9, 2020

zimulala requested changes Apr 9, 2020

View reviewed changes

zimulala approved these changes Apr 9, 2020

View reviewed changes

Merge branch 'master' into fix_tidb_version

07e1a23

Merge branch 'master' into fix_tidb_version

0f26d48

sre-bot merged commit c635ac8 into pingcap:master Apr 9, 2020

reafans deleted the fix_tidb_version branch April 9, 2020 05:43

crazycs520 mentioned this pull request Apr 15, 2020

cluster_info table: it's better to show v4.0.0-rc instead of 5.7.25-TiDB-v4.0.0-rc #16302

Closed

crazycs520 added the needs-cherry-pick-4.0 label Jul 7, 2020

ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jul 7, 2020

cherry pick pingcap#16003 to release-4.0

d4129e7

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request Jul 7, 2020

infoschema: fix tidb version showed in cluster_info table and update the go.mod for new sysutil (#16003) #18413

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

infoschema: fix tidb version showed in cluster_info table and update the go.mod for new sysutil #16003

infoschema: fix tidb version showed in cluster_info table and update the go.mod for new sysutil #16003

reafans commented Apr 2, 2020 •

edited

Loading

CLAassistant commented Apr 2, 2020 •

edited

Loading

reafans commented Apr 2, 2020

codecov bot commented Apr 2, 2020 •

edited

Loading

Deardrops left a comment

Deardrops Apr 7, 2020

crazycs520 Apr 7, 2020

reafans Apr 7, 2020 •

edited

Loading

reafans commented Apr 9, 2020

zimulala left a comment

sre-bot commented Apr 9, 2020

zimulala Apr 9, 2020

reafans Apr 9, 2020

zimulala Apr 9, 2020

sre-bot commented Apr 9, 2020

reafans commented Apr 9, 2020

sre-bot commented Apr 9, 2020

sre-bot commented Apr 9, 2020

sre-bot commented Apr 9, 2020

reafans commented Apr 9, 2020

reafans commented Apr 9, 2020

reafans commented Apr 9, 2020

reafans commented Apr 9, 2020

sre-bot commented Apr 9, 2020

ti-srebot commented Jul 7, 2020

infoschema: fix tidb version showed in cluster_info table and update the go.mod for new sysutil #16003

infoschema: fix tidb version showed in cluster_info table and update the go.mod for new sysutil #16003

Conversation

reafans commented Apr 2, 2020 • edited Loading

What problem does this PR solve?

What is changed and how it works?

Check List

CLAassistant commented Apr 2, 2020 • edited Loading

reafans commented Apr 2, 2020

codecov bot commented Apr 2, 2020 • edited Loading

Codecov Report

Deardrops left a comment

Choose a reason for hiding this comment

Deardrops Apr 7, 2020

Choose a reason for hiding this comment

crazycs520 Apr 7, 2020

Choose a reason for hiding this comment

reafans Apr 7, 2020 • edited Loading

Choose a reason for hiding this comment

reafans commented Apr 9, 2020

zimulala left a comment

Choose a reason for hiding this comment

sre-bot commented Apr 9, 2020

zimulala Apr 9, 2020

Choose a reason for hiding this comment

reafans Apr 9, 2020

Choose a reason for hiding this comment

zimulala Apr 9, 2020

Choose a reason for hiding this comment

sre-bot commented Apr 9, 2020

reafans commented Apr 9, 2020

sre-bot commented Apr 9, 2020

sre-bot commented Apr 9, 2020

sre-bot commented Apr 9, 2020

reafans commented Apr 9, 2020

reafans commented Apr 9, 2020

reafans commented Apr 9, 2020

reafans commented Apr 9, 2020

sre-bot commented Apr 9, 2020

ti-srebot commented Jul 7, 2020

reafans commented Apr 2, 2020 •

edited

Loading

CLAassistant commented Apr 2, 2020 •

edited

Loading

codecov bot commented Apr 2, 2020 •

edited

Loading

reafans Apr 7, 2020 •

edited

Loading