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

Jump to bottom

ttl: fix data race in TTL manager and test #40976

Merged
merged 9 commits into from
Feb 2, 2023
Merged

ttl: fix data race in TTL manager and test #40976

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b7b6a51
fix data race in TTL manager
YangKeao Feb 2, 2023
d8dd633
Merge branch 'master' into fix-datarace
hawkingrei Feb 2, 2023
fc16bff
Merge branch 'master' into fix-datarace
ti-chi-bot Feb 2, 2023
dda2f27
Merge branch 'master' into fix-datarace
ti-chi-bot Feb 2, 2023
424fb20
Merge branch 'master' into fix-datarace
hawkingrei Feb 2, 2023
07f2366
Merge branch 'master' into fix-datarace
ti-chi-bot Feb 2, 2023
9e1ade3
Merge branch 'master' into fix-datarace
ti-chi-bot Feb 2, 2023
2fa771c
Merge branch 'master' into fix-datarace
ti-chi-bot Feb 2, 2023
7bd2ab9
Merge branch 'master' into fix-datarace
ti-chi-bot Feb 2, 2023
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
6 changes: 3 additions & 3 deletions domain/domain.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ type Domain struct {
expiredTimeStamp4PC types.Time
logBackupAdvancer *daemon.OwnerDaemon
historicalStatsWorker *HistoricalStatsWorker
ttlJobManager *ttlworker.JobManager
ttlJobManager atomic.Pointer[ttlworker.JobManager]

serverID uint64
serverIDSession *concurrency.Session
Expand Down Expand Up @@ -2513,7 +2513,7 @@ func (do *Domain) StartTTLJobManager() {
}()

ttlJobManager := ttlworker.NewJobManager(do.ddl.GetID(), do.sysSessionPool, do.store, do.etcdClient)
do.ttlJobManager = ttlJobManager
do.ttlJobManager.Store(ttlJobManager)
ttlJobManager.Start()

<-do.exit
Expand All @@ -2528,7 +2528,7 @@ func (do *Domain) StartTTLJobManager() {

// TTLJobManager returns the ttl job manager on this domain
func (do *Domain) TTLJobManager() *ttlworker.JobManager {
return do.ttlJobManager
return do.ttlJobManager.Load()
}

func init() {
Expand Down