Fix inhibit race #1032
Merged
Fix inhibit race #1032
Conversation
This file contains 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
| for { | ||
| select { | ||
| case <-time.After(15 * time.Minute): | ||
| for _, r := range ih.rules { | ||
| r.gc() | ||
| } | ||
| case <-ih.stopc: | ||
| case <-ctx.Done(): | ||
| return |
There was a problem hiding this comment.
Think you should return ctx.Err()
There was a problem hiding this comment.
ctx.Err() just returns why a context was canceled or deadline exceeded. It doesn't actually tell us anything here.
// If Done is not yet closed, Err returns nil.
// If Done is closed, Err returns a non-nil error explaining why:
// Canceled if the context was canceled
// or DeadlineExceeded if the context's deadline passed.
// After Err returns a non-nil error, successive calls to Err return the same error.
Err() error
There was a problem hiding this comment.
true, but if non nil isn't worth logging?
There was a problem hiding this comment.
I don't think so, because we explicitly use the context to cancel the execution in the Inhibitor.Stop method.
There was a problem hiding this comment.
Yes, the error is always != nil if the context was canceled. If we expect this to happen, there's generally no point in checking.
stuartnelson3
approved these changes
Oct 7, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #1014
@fabxc @stuartnelson3