Unify usage of context in slasher client #5684
Merged
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
prestonvanloon
previously approved these changes
Apr 29, 2020
|
Build fails |
|
did you try it in runtime? |
Yes! Gets cancelled instantly, before it would always hand and I'd have to manually interrupt it. |
rauljordan
reviewed
Apr 29, 2020
slasher/beaconclient/receivers.go
Outdated
| @@ -134,6 +134,10 @@ func (bs *Service) collectReceivedAttestations(ctx context.Context) { | |||
| case att := <-bs.receivedAttestationsBuffer: | |||
| atts = append(atts, att) | |||
| case collectedAtts := <-bs.collectedAttestationsBuffer: | |||
| if err := ctx.Err(); err != nil { | |||
There was a problem hiding this comment.
If this is in a for select block <-ctx.Err(): should be its own case
slasher/detection/listeners.go
Outdated
| @@ -56,6 +56,10 @@ func (ds *Service) detectIncomingAttestations(ctx context.Context, ch chan *ethp | |||
| for { | |||
| select { | |||
| case indexedAtt := <-ch: | |||
| if err := ctx.Err(); err != nil { | |||
slasher/detection/service.go
Outdated
| @@ -93,7 +93,7 @@ func (ds *Service) Start() { | |||
| // our gRPC client to keep detecting slashable offenses. | |||
| go ds.detectIncomingBlocks(ds.ctx, ds.blocksChan) | |||
| go ds.detectIncomingAttestations(ds.ctx, ds.attsChan) | |||
| go ds.detectHistoricalChainData(ds.ctx) | |||
| //go ds.detectHistoricalChainData(ds.ctx) | |||
…slasher-unify-ctx
…prysm into slasher-unify-ctx
Codecov Report
@@ Coverage Diff @@
## master #5684 +/- ##
===========================================
- Coverage 54.14% 12.76% -41.39%
===========================================
Files 311 117 -194
Lines 25982 9132 -16850
===========================================
- Hits 14069 1166 -12903
+ Misses 9859 7818 -2041
+ Partials 2054 148 -1906 |
rauljordan
approved these changes
Apr 29, 2020
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.
What type of PR is this?
Improvement
What does this PR do? Why is it needed?
This mirrors #5671 to the slasher client, to ensure SIGTERM cancels when it should be, and also makes sure the wrong context isn't passed into functions.