cmd/thanos/receive: fix close chan panic #1595
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
|
Yes you’re totally right. This is an unrelated issue but a bug nonetheless. I’ll address this in the same pr |
This commit fixes a panic caused by sending on the chan which is closed too early. This chan was closed when the setup func returned, rather than when the group's goroutine returned. Fixes: thanos-io#1594 Signed-off-by: Lucas Servén Marín <[email protected]>
|
Confirmed these changes resolved the panics. However hit another issue where the TSDB doesn't start back up after a flush event. Looks to me this cancel call closes the Line 422 in e7d8707 |
|
Yeah you’re right. That cancel is leftover from a previous iteration where the upload used a cancellable context and |
This commit fixes how the uploader is cleaned up. Currently, it was cleaned up in a defer block that was run before the run groups. This ensures the cleanup occurs only when the run groups are returning. Signed-off-by: Lucas Servén Marín <[email protected]>
brancz
approved these changes
Oct 2, 2019
GiedriusS
pushed a commit
that referenced
this pull request
Oct 28, 2019
* cmd/thanos/receive: fix close chan panic This commit fixes a panic caused by sending on the chan which is closed too early. This chan was closed when the setup func returned, rather than when the group's goroutine returned. Fixes: #1594 Signed-off-by: Lucas Servén Marín <[email protected]> * cmd/thanos/receive: correctly clean up uploader This commit fixes how the uploader is cleaned up. Currently, it was cleaned up in a defer block that was run before the run groups. This ensures the cleanup occurs only when the run groups are returning. Signed-off-by: Lucas Servén Marín <[email protected]> Signed-off-by: Giedrius Statkevičius <[email protected]>
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.
This commit fixes a panic caused by sending on the chan which is closed
too early. This chan was closed when the setup func returned, rather
than when the group's goroutine returned.
Fixes: #1594
Signed-off-by: Lucas Servén Marín [email protected]