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

*: the value of tikv-client.store-liveness-timeout should not less than 0 #24244

Merged
merged 22 commits into from
May 12, 2021
Merged
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
e0469fc
Merge pull request #1 from pingcap/master
Howie59 Mar 15, 2021
7d60de6
Merge branch 'master' of https://github.saobby.my.eu.org.cnpmjs.org/pingcap/tidb
Howie59 Mar 18, 2021
0297c4a
Merge branch 'master' of https://github.saobby.my.eu.org.cnpmjs.org/Pingcap/tidb
Howie59 Apr 1, 2021
d4aa60c
Merge branch 'master' of https://github.saobby.my.eu.org.cnpmjs.org/Pingcap/tidb
Howie59 Apr 5, 2021
0362a4b
Merge branch 'master' of https://github.saobby.my.eu.org.cnpmjs.org/pingcap/tidb
Howie59 Apr 8, 2021
382f2ce
Merge branch 'master' of https://github.com/pingcap/tidb
Howie59 Apr 15, 2021
1108209
Merge branch 'master' of https://github.saobby.my.eu.org.cnpmjs.org/pingcap/tidb
Howie59 Apr 16, 2021
bf43b07
Merge branch 'master' of https://github.saobby.my.eu.org.cnpmjs.org/pingcap/tidb
Howie59 Apr 17, 2021
9e41542
Merge branch 'master' of https://github.saobby.my.eu.org.cnpmjs.org/pingcap/tidb
Howie59 Apr 19, 2021
dfc62d3
Merge branch 'master' of https://github.saobby.my.eu.org.cnpmjs.org/pingcap/tidb
Howie59 Apr 20, 2021
27572fa
Merge branch 'master' of https://github.saobby.my.eu.org.cnpmjs.org/pingcap/tidb
Howie59 Apr 23, 2021
5bdadbe
fix issue#24109
Howie59 Apr 23, 2021
06e1a0e
Merge branch 'master' into issue-24109
Howie59 Apr 23, 2021
b74d2d5
Merge branch 'master' of https://github.saobby.my.eu.org.cnpmjs.org/pingcap/tidb
Howie59 Apr 23, 2021
fb68534
Merge branch 'master' into issue-24109
Howie59 Apr 23, 2021
23ea16e
Merge branch 'issue-24109' of https://github.saobby.my.eu.org.cnpmjs.org/Howie59/t…
Howie59 Apr 23, 2021
af095bd
Merge branch 'master' into issue-24109
Howie59 Apr 26, 2021
dd653c8
Merge branch 'master' into issue-24109
Howie59 May 6, 2021
e6582af
Merge branch 'master' into issue-24109
ti-chi-bot May 12, 2021
b4bda12
Merge branch 'master' into issue-24109
ti-chi-bot May 12, 2021
c474185
Merge branch 'master' into issue-24109
Howie59 May 12, 2021
22bc8e9
Merge branch 'master' into issue-24109
ti-chi-bot May 12, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tidb-server/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,7 @@ func setGlobalVars() {
kvcache.GlobalLRUMemUsageTracker.AttachToGlobalTracker(executor.GlobalMemoryUsageTracker)

t, err := time.ParseDuration(cfg.TiKVClient.StoreLivenessTimeout)
if err != nil {
if err != nil || t < 0 {
logutil.BgLogger().Fatal("invalid duration value for store-liveness-timeout",
zap.String("currentValue", cfg.TiKVClient.StoreLivenessTimeout))
}
Expand Down