Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OCC] Fix hang where abort channel blocks iterator #379

Merged
merged 4 commits into from
Dec 13, 2023

Conversation

stevenlanders
Copy link
Contributor

Describe your changes and provide context

  • instead of assuming one thing will arrive to the abort channel, drain it

Testing performed to validate your change

  • new unit test captures situation (tests iterator)

@stevenlanders stevenlanders marked this pull request as ready for review December 12, 2023 03:10
@stevenlanders stevenlanders changed the title Fix hang where abort channel blocks iterator [OCC] Fix hang where abort channel blocks iterator Dec 12, 2023
Copy link

codecov bot commented Dec 12, 2023

Codecov Report

Merging #379 (16a9e50) into occ-main (3c5cfcc) will increase coverage by 0.02%.
Report is 1 commits behind head on occ-main.
The diff coverage is 100.00%.

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff              @@
##           occ-main     #379      +/-   ##
============================================
+ Coverage     56.12%   56.14%   +0.02%     
============================================
  Files           627      627              
  Lines         52887    52914      +27     
============================================
+ Hits          29682    29708      +26     
- Misses        21097    21098       +1     
  Partials       2108     2108              
Files Coverage Δ
tasks/scheduler.go 89.18% <100.00%> (+0.95%) ⬆️

... and 1 file with indirect coverage changes

@@ -442,7 +441,8 @@ func (s *scheduler) prepareTask(task *deliverTxTask) {
}

// executeTask executes a single task
func (s *scheduler) executeTask(task *deliverTxTask) {
func (s *scheduler) executeTask3(task *deliverTxTask) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this just for preserving the old impl?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nope- this was an oversight that needs removing :)

@stevenlanders stevenlanders merged commit 2b2fb0e into occ-main Dec 13, 2023
15 checks passed
@stevenlanders stevenlanders deleted the fix-iterator-hang branch December 13, 2023 02:26
udpatil pushed a commit that referenced this pull request Jan 2, 2024
## Describe your changes and provide context
- instead of assuming one thing will arrive to the abort channel, drain
it
## Testing performed to validate your change
- new unit test captures situation (tests iterator)
udpatil pushed a commit that referenced this pull request Jan 8, 2024
## Describe your changes and provide context
- instead of assuming one thing will arrive to the abort channel, drain
it
## Testing performed to validate your change
- new unit test captures situation (tests iterator)
udpatil pushed a commit that referenced this pull request Jan 8, 2024
## Describe your changes and provide context
- instead of assuming one thing will arrive to the abort channel, drain
it
## Testing performed to validate your change
- new unit test captures situation (tests iterator)
udpatil pushed a commit that referenced this pull request Jan 18, 2024
## Describe your changes and provide context
- instead of assuming one thing will arrive to the abort channel, drain
it
## Testing performed to validate your change
- new unit test captures situation (tests iterator)
udpatil pushed a commit that referenced this pull request Jan 18, 2024
## Describe your changes and provide context
- instead of assuming one thing will arrive to the abort channel, drain
it
## Testing performed to validate your change
- new unit test captures situation (tests iterator)
udpatil pushed a commit that referenced this pull request Jan 25, 2024
## Describe your changes and provide context
- instead of assuming one thing will arrive to the abort channel, drain
it
## Testing performed to validate your change
- new unit test captures situation (tests iterator)
udpatil pushed a commit that referenced this pull request Jan 31, 2024
## Describe your changes and provide context
- instead of assuming one thing will arrive to the abort channel, drain
it
## Testing performed to validate your change
- new unit test captures situation (tests iterator)
codchen pushed a commit that referenced this pull request Feb 6, 2024
## Describe your changes and provide context
- instead of assuming one thing will arrive to the abort channel, drain
it
## Testing performed to validate your change
- new unit test captures situation (tests iterator)
udpatil pushed a commit that referenced this pull request Feb 27, 2024
## Describe your changes and provide context
- instead of assuming one thing will arrive to the abort channel, drain
it
## Testing performed to validate your change
- new unit test captures situation (tests iterator)
udpatil pushed a commit that referenced this pull request Mar 1, 2024
## Describe your changes and provide context
- instead of assuming one thing will arrive to the abort channel, drain
it
## Testing performed to validate your change
- new unit test captures situation (tests iterator)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants