Skip to content

Fix catalog gc #22169

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

Merged
merged 2 commits into from
Jul 15, 2025
Merged

Fix catalog gc #22169

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c301366
Fix catalog gc
LeftHandCold Jul 15, 2025
07acc0b
remote log
LeftHandCold Jul 15, 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: 10 additions & 7 deletions pkg/vm/engine/tae/db/cronjobs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,23 +176,26 @@ func AddCronJob(db *DB, name string, skipMode bool) (err error) {
if db.Opts.CatalogCfg.DisableGC {
return
}
scanWaterMark := db.DiskCleaner.GetCleaner().GetScanWaterMark()
if scanWaterMark == nil {
ckp := db.BGCheckpointRunner.MaxIncrementalCheckpoint()
if ckp == nil {
return
}
wartMark := ckp.GetEnd()
if wartMark.IsEmpty() {
return
}
ts := scanWaterMark.GetEnd()
// If gcWaterMark has not been updated for a long time
// exceeding GlobalVersionInterval, use GlobalVersionInterval
// must be more than 10 minutes to be effective,
// because in some cases of ut, GlobalVersionInterval will be very short
if db.Opts.CheckpointCfg.GlobalVersionInterval > 10*time.Minute {
interval := types.BuildTS(time.Now().UTC().UnixNano()-
ts := types.BuildTS(wartMark.Physical()-
int64(db.Opts.CheckpointCfg.GlobalVersionInterval), 0)
if ts.LE(&interval) {
ts = interval
if wartMark.GE(&ts) {
wartMark = ts
}
}
db.Catalog.GCByTS(ctx, ts)
db.Catalog.GCByTS(ctx, wartMark)
},
1,
)
Expand Down
Loading