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

gc(ticdc): fix data race in gc manager (#9897) #9908

Closed
wants to merge 1 commit into from
Closed

gc(ticdc): fix data race in gc manager (#9897) #9908

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
10 changes: 8 additions & 2 deletions pkg/txnutil/gc/gc_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (
"github.com/pingcap/tiflow/pkg/pdutil"
"github.com/tikv/client-go/v2/oracle"
pd "github.com/tikv/pd/client"
"go.uber.org/atomic"
"go.uber.org/zap"
)

Expand All @@ -49,7 +50,7 @@ type gcManager struct {
lastUpdatedTime time.Time
lastSucceededTime time.Time
lastSafePointTs uint64
isTiCDCBlockGC bool
isTiCDCBlockGC atomic.Bool
}

// NewManager creates a new Manager.
Expand Down Expand Up @@ -99,7 +100,7 @@ func (m *gcManager) TryUpdateGCSafePoint(
// if the min checkpoint ts is equal to the current gc safe point, it
// means that the service gc safe point set by TiCDC is the min service
// gc safe point
m.isTiCDCBlockGC = actual == checkpointTs
m.isTiCDCBlockGC.Store(actual == checkpointTs)
m.lastSafePointTs = actual
m.lastSucceededTime = time.Now()
return nil
Expand All @@ -109,8 +110,13 @@ func (m *gcManager) CheckStaleCheckpointTs(
ctx context.Context, changefeedID model.ChangeFeedID, checkpointTs model.Ts,
) error {
gcSafepointUpperBound := checkpointTs - 1
<<<<<<< HEAD
if m.isTiCDCBlockGC {
pdTime, _ := m.pdClock.CurrentTime()
=======
if m.isTiCDCBlockGC.Load() {
pdTime := m.pdClock.CurrentTime()
>>>>>>> 3b3b61e53a (gc(ticdc): fix data race in gc manager (#9897))
if pdTime.Sub(
oracle.GetTimeFromTS(gcSafepointUpperBound),
) > time.Duration(m.gcTTL)*time.Second {
Expand Down