Skip to content

Commit

Permalink
fix: truncated file size compare
Browse files Browse the repository at this point in the history
  • Loading branch information
yiqiwang-17 committed Aug 23, 2024
1 parent f5eb32e commit 7fc53a7
Showing 1 changed file with 21 additions and 8 deletions.
29 changes: 21 additions & 8 deletions filebeat/input/log/input.go
Original file line number Diff line number Diff line change
Expand Up @@ -548,15 +548,28 @@ func (p *Input) harvestExistingFile(newState file.State, oldState file.State) {
}

// File size was reduced -> truncated file
if oldState.Finished && newState.Fileinfo.Size() < oldState.Offset {
logp.Debug("input", "Old file was truncated. Starting from the beginning: %s, offset: %d, new size: %d ", newState.Source, newState.Offset, newState.Fileinfo.Size())
err := p.startHarvester(newState, 0)
if err != nil {
logp.Err("Harvester could not be started on truncated file: %s, Err: %s", newState.Source, err)
}
if oldState.Finished {
if oldState.Fileinfo == nil && newState.Fileinfo.Size() < oldState.Offset {
logp.Err("Old file was truncated. Starting from the beginning: %s, old source: %s, offset: %d, new size: %d,"+
" old StateOS: %s, new StateOS: %s", newState.Source, oldState.Source, oldState.Offset, newState.Fileinfo.Size(), oldState.FileStateOS.String(), newState.FileStateOS.String())
err := p.startHarvester(newState, 0)
if err != nil {
logp.Err("Harvester could not be started on truncated file: %s, Err: %s", newState.Source, err)
}

filesTruncated.Add(1)
return
filesTruncated.Add(1)
return
} else if oldState.Fileinfo != nil && newState.Fileinfo.Size() < oldState.Fileinfo.Size() {
logp.Err("Old file was truncated. Starting from the beginning: %s, old source: %s, offset: %d, old size: %d, new size: %d,"+
" old StateOS: %s, new StateOS: %s", newState.Source, oldState.Source, oldState.Offset, oldState.Fileinfo.Size(), newState.Fileinfo.Size(), oldState.FileStateOS.String(), newState.FileStateOS.String())
err := p.startHarvester(newState, 0)
if err != nil {
logp.Err("Harvester could not be started on truncated file: %s, Err: %s", newState.Source, err)
}

filesTruncated.Add(1)
return
}
}

// Check if file was renamed
Expand Down

0 comments on commit 7fc53a7

Please sign in to comment.