fix(agent): Use a unique WAL file for plugin instances of the same type (#15966)

This commit is contained in:
Dane Strandboge 2024-10-18 13:22:02 -05:00 committed by GitHub
parent 39a5ca27ef
commit e257c14ec1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 17 additions and 9 deletions

View File

@ -362,7 +362,7 @@ The agent table configures Telegraf and the defaults used across all plugins.
- **buffer_directory**: - **buffer_directory**:
The directory to use when in `disk` buffer mode. Each output plugin will make The directory to use when in `disk` buffer mode. Each output plugin will make
another subdirectory in this directory with the output plugin's name. another subdirectory in this directory with the output plugin's ID.
## Plugins ## Plugins

View File

@ -49,7 +49,7 @@ type BufferStats struct {
} }
// NewBuffer returns a new empty Buffer with the given capacity. // NewBuffer returns a new empty Buffer with the given capacity.
func NewBuffer(name string, alias string, capacity int, strategy string, path string) (Buffer, error) { func NewBuffer(name, id, alias string, capacity int, strategy, path string) (Buffer, error) {
registerGob() registerGob()
bs := NewBufferStats(name, alias, capacity) bs := NewBufferStats(name, alias, capacity)
@ -58,7 +58,7 @@ func NewBuffer(name string, alias string, capacity int, strategy string, path st
case "", "memory": case "", "memory":
return NewMemoryBuffer(capacity, bs) return NewMemoryBuffer(capacity, bs)
case "disk": case "disk":
return NewDiskBuffer(name, path, bs) return NewDiskBuffer(name, id, path, bs)
} }
return nil, fmt.Errorf("invalid buffer strategy %q", strategy) return nil, fmt.Errorf("invalid buffer strategy %q", strategy)
} }

View File

@ -33,12 +33,19 @@ type DiskBuffer struct {
isEmpty bool isEmpty bool
} }
func NewDiskBuffer(name string, path string, stats BufferStats) (*DiskBuffer, error) { func NewDiskBuffer(name, id, path string, stats BufferStats) (*DiskBuffer, error) {
filePath := filepath.Join(path, name) filePath := filepath.Join(path, id)
walFile, err := wal.Open(filePath, nil) walFile, err := wal.Open(filePath, nil)
if err != nil { if err != nil {
return nil, fmt.Errorf("failed to open wal file: %w", err) return nil, fmt.Errorf("failed to open wal file: %w", err)
} }
//nolint:errcheck // cannot error here
if index, _ := walFile.FirstIndex(); index == 0 {
// simple way to test if the walfile is freshly initialized, meaning no existing file was found
log.Printf("I! WAL file not found for plugin outputs.%s (%s), "+
"this can safely be ignored if you added this plugin instance for the first time", name, id)
}
buf := &DiskBuffer{ buf := &DiskBuffer{
BufferStats: stats, BufferStats: stats,
file: walFile, file: walFile,

View File

@ -22,7 +22,7 @@ func newTestDiskBuffer(t testing.TB) Buffer {
func newTestDiskBufferWithPath(t testing.TB, name string, path string) Buffer { func newTestDiskBufferWithPath(t testing.TB, name string, path string) Buffer {
t.Helper() t.Helper()
buf, err := NewBuffer(name, "", 0, "disk", path) buf, err := NewBuffer(name, "123", "", 0, "disk", path)
require.NoError(t, err) require.NoError(t, err)
buf.Stats().MetricsAdded.Set(0) buf.Stats().MetricsAdded.Set(0)
buf.Stats().MetricsWritten.Set(0) buf.Stats().MetricsWritten.Set(0)
@ -45,6 +45,7 @@ func TestBuffer_RetainsTrackingInformation(t *testing.T) {
func TestBuffer_TrackingDroppedFromOldWal(t *testing.T) { func TestBuffer_TrackingDroppedFromOldWal(t *testing.T) {
path, err := os.MkdirTemp("", "*-buffer-test") path, err := os.MkdirTemp("", "*-buffer-test")
require.NoError(t, err) require.NoError(t, err)
path = filepath.Join(path, "123")
walfile, err := wal.Open(path, nil) walfile, err := wal.Open(path, nil)
require.NoError(t, err) require.NoError(t, err)

View File

@ -8,7 +8,7 @@ import (
func newTestMemoryBuffer(t testing.TB, capacity int) Buffer { func newTestMemoryBuffer(t testing.TB, capacity int) Buffer {
t.Helper() t.Helper()
buf, err := NewBuffer("test", "", capacity, "memory", "") buf, err := NewBuffer("test", "123", "", capacity, "memory", "")
require.NoError(t, err) require.NoError(t, err)
buf.Stats().MetricsAdded.Set(0) buf.Stats().MetricsAdded.Set(0)
buf.Stats().MetricsWritten.Set(0) buf.Stats().MetricsWritten.Set(0)

View File

@ -84,7 +84,7 @@ func MetricTime(sec int64) telegraf.Metric {
func (s *BufferSuiteTest) newTestBuffer(capacity int) Buffer { func (s *BufferSuiteTest) newTestBuffer(capacity int) Buffer {
s.T().Helper() s.T().Helper()
buf, err := NewBuffer("test", "", capacity, s.bufferType, s.bufferPath) buf, err := NewBuffer("test", "123", "", capacity, s.bufferType, s.bufferPath)
s.Require().NoError(err) s.Require().NoError(err)
buf.Stats().MetricsAdded.Set(0) buf.Stats().MetricsAdded.Set(0)
buf.Stats().MetricsWritten.Set(0) buf.Stats().MetricsWritten.Set(0)

View File

@ -104,7 +104,7 @@ func NewRunningOutput(
batchSize = DefaultMetricBatchSize batchSize = DefaultMetricBatchSize
} }
b, err := NewBuffer(config.Name, config.Alias, bufferLimit, config.BufferStrategy, config.BufferDirectory) b, err := NewBuffer(config.Name, config.ID, config.Alias, bufferLimit, config.BufferStrategy, config.BufferDirectory)
if err != nil { if err != nil {
panic(err) panic(err)
} }