Make sure Send/Receive in StatsPusher can be canceled #4139
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
j16r
force-pushed
the
bugfix/stats_pusher_speedup_correct_ctx_use
branch
from
950700d
to
65ddcab
Compare
j16r
requested review from
connorwstein,
RyanRHall,
samsondav,
se3000 and
spooktheducks
as code owners
Before: ok github.com/smartcontractkit/chainlink/core/services/synchronization 79.264s After: (ctx first step) ok github.com/smartcontractkit/chainlink/core/services/synchronization 52.237s
Before: ok github.com/smartcontractkit/chainlink/core/services/synchronization 45.389s After: (Start() optimization) ok github.com/smartcontractkit/chainlink/core/services/synchronization 0.386s
j16r
force-pushed
the
bugfix/stats_pusher_speedup_correct_ctx_use
branch
from
65ddcab
to
31c107f
Compare
| panic("send on unstarted explorer client") | ||
| } | ||
| func (ec *explorerClient) Send(ctx context.Context, data []byte, messageTypes ...int) { | ||
| func() { |
There was a problem hiding this comment.
why the function here?
There was a problem hiding this comment.
To limit the scope of the boot lock
| @@ -166,6 +163,8 @@ func (ec *explorerClient) Send(data []byte, messageTypes ...int) { | |||
| select { | |||
| case send <- data: | |||
| atomic.StoreUint32(&ec.dropMessageCount, 0) | |||
| case <-ctx.Done(): | |||
There was a problem hiding this comment.
I think this one isn't really needed because of the default but just there for symmetry with Receive (where it does seem actually needed) ?
There was a problem hiding this comment.
To avoid logging the buffer full message if the Send gets shut down.
| wg := &sync.WaitGroup{} | ||
| wg.Add(1) | ||
| go ec.connectAndWritePump(ctx, wg) |
There was a problem hiding this comment.
I'm not following why we even need this goroutine here? If we're going to wg.Wait() right after starting it we can just make a blocking call to connectAndWritePump or even inline that code here
There was a problem hiding this comment.
Yup, I get rid of this here: #4141
connorwstein
approved these changes
Mar 30, 2021
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.
The StatsPusher tests are very slow, this should speed them up a bit...
Before:
ok github.com/smartcontractkit/chainlink/core/services/synchronization 79.264s
After: (ctx first step)
ok github.com/smartcontractkit/chainlink/core/services/synchronization 52.237s
Before: -run Auth
ok github.com/smartcontractkit/chainlink/core/services/synchronization 45.389s
After: (Start() optimization) -run Auth
ok github.com/smartcontractkit/chainlink/core/services/synchronization 0.386s
final:
ok github.com/smartcontractkit/chainlink/core/services/synchronization 8.971s