Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

tso: add retry for UpdateTSO (#9021) #9062

Merged
merged 4 commits into from
Feb 13, 2025
+15 −2
Merged

tso: add retry for UpdateTSO (#9021) #9062

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ee74e6
This is an automated cherry-pick of #9021
lhy1024 Feb 5, 2025
2c9a6b2
fix conflict
lhy1024 Feb 11, 2025
91fda0c
rm lta
lhy1024 Feb 11, 2025
88e9602
Merge branch 'release-6.5' into cherry-pick-9021-to-release-6.5
lhy1024 Feb 13, 2025
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
17 changes: 15 additions & 2 deletions server/tso/global_allocator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,21 @@ func (gta *GlobalTSOAllocator) IsInitialize() bool {
}

// UpdateTSO is used to update the TSO in memory and the time window in etcd.
func (gta *GlobalTSOAllocator) UpdateTSO() error {
return gta.timestampOracle.UpdateTimestamp(gta.leadership)
func (gta *GlobalTSOAllocator) UpdateTSO() (err error) {
// When meet network partition, we need to manually retry to update the global tso,
// next request succeeds with the new endpoint, according to https://github.com/etcd-io/etcd/issues/8711
maxRetryCount := 3
for i := 0; i < maxRetryCount; i++ {
err = gta.timestampOracle.UpdateTimestamp(gta.leadership)
if err == nil {
return nil
}
log.Warn("try to update the global tso but failed", errs.ZapError(err))
// Etcd client retry with roundRobinQuorumBackoff https://github.com/etcd-io/etcd/blob/d62cdeee4863001b09e772ed013eb1342a1d0f89/client/v3/client.go#L488
// And its default interval is 25ms, so we sleep 50ms here. https://github.com/etcd-io/etcd/blob/d62cdeee4863001b09e772ed013eb1342a1d0f89/client/v3/options.go#L53
time.Sleep(50 * time.Millisecond)
}
return
}

// SetTSO sets the physical part with given TSO.
Expand Down