streamingccl: fix double close in test feed source#68189
Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom Jul 28, 2021
Merged
streamingccl: fix double close in test feed source#68189craig[bot] merged 1 commit intocockroachdb:masterfrom
craig[bot] merged 1 commit intocockroachdb:masterfrom
Conversation
Member
|
This change is |
miretskiy
approved these changes
Jul 28, 2021
Contributor
miretskiy
left a comment
There was a problem hiding this comment.
Reviewed 2 of 2 files at r1.
Reviewable status:complete! 0 of 0 LGTMs obtained (waiting on @pbardea)
Previously, the close implementation of channelFeedSource closed the `eventCh` as a means of shutting down the client. This seems wrong since the client is the "owner" of this channel and should be the only one responsible for closing it. In cases where the method `consumeUntil` hit an error (max wait timeout in our case) we would close the eventCh as part of calling channelFeedSource's Close(), and we would attempt a double close in the sinkless client itself. This change switches to cancelling the sinkless client's context to indicate to the client that it should shutdown. I was not able to reproduce this error (5000 stress runs), but I bumped the timeout from 10 seconds to 20 seconds based on stack traces in the failed builds. Fixes: cockroachdb#68168 Fixes: cockroachdb#67592 Release note: None
aca069d to
080f904
Compare
Contributor
Author
|
TFTR! bors r=miretskiy |
Contributor
|
Build succeeded: |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 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.
Previously, the close implementation of channelFeedSource
closed the
eventChas a means of shutting down the client.This seems wrong since the client is the "owner" of this
channel and should be the only one responsible for closing
it. In cases where the method
consumeUntilhit an error(max wait timeout in our case) we would close the eventCh
as part of calling channelFeedSource's Close(), and we would
attempt a double close in the sinkless client itself.
This change switches to cancelling the sinkless client's
context to indicate to the client that it should shutdown.
I was not able to reproduce this error (5000 stress runs),
but I bumped the timeout from 10 seconds to 20 seconds
based on stack traces in the failed builds.
Fixes: #68168
Fixes: #67592
Release note: None