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

tso: fix the bug that TSO request may fail at the time of leader changing (#2665) #2666

Merged
merged 1 commit into from
Jul 21, 2020
Merged

tso: fix the bug that TSO request may fail at the time of leader changing (#2665) #2666

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 17 additions & 2 deletions server/tso/tso.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ package tso

import (
"path"
"sync"
"sync/atomic"
"time"
"unsafe"
Expand Down Expand Up @@ -45,6 +46,7 @@ type TimestampOracle struct {
ts unsafe.Pointer
lastSavedTime atomic.Value

mu sync.RWMutex
lease *member.LeaderLease

rootPath string
Expand Down Expand Up @@ -86,6 +88,12 @@ func (t *TimestampOracle) loadTimestamp() (time.Time, error) {
return typeutil.ParseTimestamp(data)
}

func (t *TimestampOracle) checkLease() bool {
t.mu.RLock()
defer t.mu.RUnlock()
return t.lease != nil && !t.lease.IsExpired()
}

// save timestamp, if lastTs is 0, we think the timestamp doesn't exist, so create it,
// otherwise, update it.
func (t *TimestampOracle) saveTimestamp(ts time.Time) error {
Expand Down Expand Up @@ -140,15 +148,17 @@ func (t *TimestampOracle) SyncTimestamp(lease *member.LeaderLease) error {
current := &atomicObject{
physical: next,
}
t.mu.Lock()
t.lease = lease
t.mu.Unlock()
atomic.StorePointer(&t.ts, unsafe.Pointer(current))

return nil
}

// ResetUserTimestamp update the physical part with specified tso.
func (t *TimestampOracle) ResetUserTimestamp(tso uint64) error {
if t.lease == nil || t.lease.IsExpired() {
if !t.checkLease() {
tsoCounter.WithLabelValues("err_lease_reset_ts").Inc()
return errors.New("Setup timestamp failed, lease expired")
}
Expand Down Expand Up @@ -273,6 +283,11 @@ func (t *TimestampOracle) GetRespTS(count uint32) (pdpb.Timestamp, error) {
for i := 0; i < maxRetryCount; i++ {
current := (*atomicObject)(atomic.LoadPointer(&t.ts))
if current == nil || current.physical == typeutil.ZeroTime {
// If it's leader, maybe SyncTimestamp hasn't completed yet
if t.checkLease() {
time.Sleep(200 * time.Millisecond)
continue
}
return pdpb.Timestamp{}, errors.New("can not get timestamp, may be not leader")
}

Expand All @@ -287,7 +302,7 @@ func (t *TimestampOracle) GetRespTS(count uint32) (pdpb.Timestamp, error) {
continue
}
// In case lease expired after the first check.
if t.lease == nil || t.lease.IsExpired() {
if !t.checkLease() {
return pdpb.Timestamp{}, errors.New("alloc timestamp failed, lease expired")
}
return resp, nil
Expand Down