Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: Add new logging for compaction level 5 and remove bug with opt holdoff time (#26488) (#26490) 

Previously

```go
// StartOptHoldOff will create a hold off timer for OptimizedCompaction
func (e *Engine) StartOptHoldOff(holdOffDurationCheck time.Duration, optHoldoffStart time.Time, optHoldoffDuration time.Duration) {
	startOptHoldoff := func(dur time.Duration) {
		optHoldoffStart = time.Now()
		optHoldoffDuration = dur
		e.logger.Info("optimize compaction holdoff timer started", logger.Shard(e.id), zap.Duration("duration", optHoldoffDuration), zap.Time("endTime", optHoldoffStart.Add(optHoldoffDuration)))
	}
	startOptHoldoff(holdOffDurationCheck)
}
```
was not passing the data by reference which meant we were never modifying the `optHoldoffDuration` and `optHoldoffStart` vars.

This PR also adds additional logging to Optimized level 5 compactions to clear up a little bit of confusion around log messages.

(cherry picked from commit 7437f275ff)
1.12 v1.12.1rc3
WeblWabl 2025-06-03 09:05:52 -05:00 committed by GitHub
parent 2a0353ffd2
commit 0fdb6adcb2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tsdb/engine/tsm1/engine.go
View File

@ -2163,16 +2163,6 @@ const optimizationHoldoff = 5 * time.Minute
// tickPeriod is the interval between successive compaction loops.
const tickPeriod = time.Second
// StartOptHoldOff will create a hold off timer for OptimizedCompaction
func (e *Engine) StartOptHoldOff(holdOffDurationCheck time.Duration, optHoldoffStart time.Time, optHoldoffDuration time.Duration) {
startOptHoldoff := func(dur time.Duration) {
optHoldoffStart = time.Now()
optHoldoffDuration = dur
e.logger.Info("optimize compaction holdoff timer started", logger.Shard(e.id), zap.Duration("duration", optHoldoffDuration), zap.Time("endTime", optHoldoffStart.Add(optHoldoffDuration)))
}
startOptHoldoff(holdOffDurationCheck)
}
func (e *Engine) GetPlanTypeBasedOnHoldOff(start time.Time, dur time.Duration) PlanType {
planType := PT_SmartOptimize
if time.Since(start) < dur {
@ -2186,7 +2176,12 @@ func (e *Engine) compact(wg *sync.WaitGroup) {
defer t.Stop()
var optHoldoffStart time.Time
var optHoldoffDuration time.Duration
e.StartOptHoldOff(initialOptimizationHoldoff, optHoldoffStart, optHoldoffDuration)
startOptHoldoff := func(dur time.Duration) {
optHoldoffStart = time.Now()
optHoldoffDuration = dur
e.logger.Info("optimize compaction holdoff timer started", logger.Shard(e.id), zap.Duration("duration", optHoldoffDuration), zap.Time("endTime", optHoldoffStart.Add(optHoldoffDuration)))
}
startOptHoldoff(initialOptimizationHoldoff)
var nextDisabledMsg time.Time
@ -2253,7 +2248,7 @@ func (e *Engine) compact(wg *sync.WaitGroup) {
}
log := e.logger.With(zap.Strings("files", theGroup), zap.Bool("aggressive", isAggressive))
log.Info("Running optimized compaction for level 5 group")
log.Debug("Checking optimized level 5 group is compactable")
if err := e.compactOptimize(theGroup, pointsPerBlock, wg); err != nil {
if errors.Is(err, ErrOptimizeCompactionLimited) {
// We've reached the limit of optimized compactions. Let's not schedule anything else this schedule cycle
@ -2267,9 +2262,10 @@ func (e *Engine) compact(wg *sync.WaitGroup) {
log.Error("Error during compactOptimize", zap.Error(err))
}
} else {
log.Info("Optimized level 5 group compacted")
level5Groups = level5Groups[1:]
}
e.StartOptHoldOff(optimizationHoldoff, optHoldoffStart, optHoldoffDuration)
startOptHoldoff(optimizationHoldoff)
}
}