Skip to content

feat(inputs.mqtt_consumer): Implement startup error behaviors #15486

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 14 commits into from
Jun 17, 2024
Merged

feat(inputs.mqtt_consumer): Implement startup error behaviors #15486

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e9f8361
Remove internal redundant connection state tracking
srebhan Jun 11, 2024
25a3519
Add integration test
srebhan Jun 11, 2024
8273955
Add integration tests for startup retry behavior
srebhan Jun 11, 2024
b5257c9
Fix race condition in test tracking-accumulator
srebhan Jun 11, 2024
33770d3
Implement startup error behavior options
srebhan Jun 11, 2024
427e6ab
Fix retry behavior
srebhan Jun 11, 2024
b398414
Make error stats counters unique to avoid side-effects between tests
srebhan Jun 12, 2024
5e5cb1e
Remove superfluous check
srebhan Jun 12, 2024
7b070fa
Make sure the stats are zero at the start of the test
srebhan Jun 12, 2024
76e8e83
Add options for tuning connection-loss detection
srebhan Jun 12, 2024
c13996f
Add new parameters to the tests
srebhan Jun 12, 2024
b14264c
Check if cancel function is valid
srebhan Jun 12, 2024
b15bc1a
Unify keep-alive setting name with other plugins
srebhan Jun 17, 2024
3fd99dd
Clarify comment for keepalive constraints
srebhan Jun 17, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix retry behavior
  • Loading branch information
@srebhan
srebhan committed Jun 11, 2024
commit 427e6ab1108cd5078fa2e7298c0a9b1c654d8dae
4 changes: 4 additions & 0 deletions plugins/inputs/mqtt_consumer/mqtt_consumer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,7 @@ func (m *MQTTConsumer) connect() error {
// Network errors might be retryable, stop the metric-tracking
// goroutine and return a retryable error.
m.cancel()
m.cancel = nil
return &internal.StartupError{
Err: token.Error(),
Retry: true,
Expand Down Expand Up @@ -327,6 +328,9 @@ func (m *MQTTConsumer) Stop() {
}
func (m *MQTTConsumer) Gather(_ telegraf.Accumulator) error {
if !m.client.IsConnected() {
if m.cancel == nil {
return internal.ErrNotConnected
}
m.Log.Debugf("Connecting %v", m.Servers)
return m.connect()
}
Expand Down