fix: make Close() idempotent and add Close tests #161
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Add sync.Once to podEventLogger to ensure Close() is safe to call multiple times - Add TestCloseIdempotent to verify double-close doesn't panic - Add TestCloseDuringProcessing to verify close during active processing
Stop all active retry timers in logQueuer.cleanup() when the context is canceled. This prevents retry timers from continuing to fire after the podEventLogger is closed, which was causing integration tests to hang waiting for httptest.Server to close.
deansheather
reviewed
Feb 5, 2026
| p.closeOnce.Do(func() { | ||
| p.cancelFunc() | ||
| close(p.stopChan) | ||
| close(p.errChan) |
Member
There was a problem hiding this comment.
Shouldn't you make this wait for the goroutines to exit too? by having a defer close(p.doneChan) at the top of the work() handler?
Address review feedback: Close() now waits for the work goroutine to fully exit before returning. Added doneChan that is closed when the work loop exits, and Close() blocks on receiving from it. Also moved work goroutine startup to newPodEventLogger to ensure it's only started once (not per-namespace).
deansheather
reviewed
Feb 5, 2026
| func (l *logQueuer) work(ctx context.Context) { | ||
| func (l *logQueuer) work(ctx context.Context, done chan struct{}) { | ||
| defer l.cleanup() | ||
| defer close(done) |
Member
There was a problem hiding this comment.
probs should be the first deffered handler no? defers run in LIFO order
If initNamespace fails, cancel the context and wait for the work goroutine to exit to prevent goroutine leaks.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Tests were reviewed and are reasonable overall. This PR adds missing test coverage and fixes bugs found during review.
Changes
Close()was not idempotent - calling it twice would panic due to closing already-closed channels. Addedsync.Onceto make it safe.cleanup()method to stop all retry timers when work loop exits.TestCloseIdempotent: Verifies double-close doesn't panicTestCloseDuringProcessing: Verifies close during active processing works correctlyTest Coverage Review
Well-Covered Areas ✓
Remaining Minor Gaps (not addressed in this PR)
WaitForCacheSynconly tested indirectly (acceptable)