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

client/tso: init the ticker when TSO Follower Proxy is already enabled (#8948) #9025

Merged
merged 2 commits into from
Jan 27, 2025
Merged

client/tso: init the ticker when TSO Follower Proxy is already enabled (#8948) #9025

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80a7fec
fix comflict
okJiang Jan 26, 2025
ebdf9e3
Merge branch 'release-6.5' into cherry-pick-8948-to-release-6.5
ti-chi-bot[bot] Jan 27, 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
18 changes: 13 additions & 5 deletions client/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,14 +731,22 @@ func (c *client) handleDispatcher(
if dc == globalDCLocation {
go func() {
var updateTicker = &time.Ticker{}
setNewUpdateTicker := func(ticker *time.Ticker) {
setNewUpdateTicker := func(interval time.Duration) {
if updateTicker.C != nil {
updateTicker.Stop()
}
updateTicker = ticker
if interval == 0 {
updateTicker = &time.Ticker{}
} else {
updateTicker = time.NewTicker(interval)
}
}
// If the TSO Follower Proxy is enabled, set the update interval to the member update interval.
if c.option.getEnableTSOFollowerProxy() {
setNewUpdateTicker(memberUpdateInterval)
}
// Set to nil before returning to ensure that the existing ticker can be GC.
defer setNewUpdateTicker(nil)
defer setNewUpdateTicker(0)

for {
select {
Expand All @@ -749,11 +757,11 @@ func (c *client) handleDispatcher(
if enableTSOFollowerProxy && updateTicker.C == nil {
// Because the TSO Follower Proxy is enabled,
// the periodic check needs to be performed.
setNewUpdateTicker(time.NewTicker(memberUpdateInterval))
setNewUpdateTicker(memberUpdateInterval)
} else if !enableTSOFollowerProxy && updateTicker.C != nil {
// Because the TSO Follower Proxy is disabled,
// the periodic check needs to be turned off.
setNewUpdateTicker(&time.Ticker{})
setNewUpdateTicker(0)
} else {
// The status of TSO Follower Proxy does not change, and updateConnectionCtxs is not triggered
continue
Expand Down
Loading