From 8babe54f13ca4e56239cead7d267a099d38585d0 Mon Sep 17 00:00:00 2001 From: Edoardo Spadolini Date: Fri, 11 Feb 2022 11:56:30 +0100 Subject: [PATCH] Don't return `nil, nil` in (*AuditWriter).tryResumeStream (#10254) * Fix logic problem in (*AuditWriter).tryResumeStream If all the attempts are discarded due to timeouts with no errors we might return nil, nil in tryResumeStream, this adds a message to the potentially nil error that makes it an actual error. * Use `LimitExceeded` instead of wrapping the error --- lib/events/auditwriter.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/events/auditwriter.go b/lib/events/auditwriter.go index f3689f2533e..d517d2786f1 100644 --- a/lib/events/auditwriter.go +++ b/lib/events/auditwriter.go @@ -533,7 +533,7 @@ func (a *AuditWriter) tryResumeStream() (apievents.Stream, error) { return nil, trace.ConnectionProblem(a.closeCtx.Err(), "operation has been canceled") } } - return nil, trace.Wrap(err) + return nil, trace.LimitExceeded("audit stream resume attempts exhausted, last error: %v", err) } func (a *AuditWriter) updateStatus(status apievents.StreamStatus) {