ledger: rearrange blockqueue start/stop #4964
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
remove stale test interface
Codecov Report
@@ Coverage Diff @@
## master #4964 +/- ##
==========================================
- Coverage 53.64% 53.63% -0.01%
==========================================
Files 432 432
Lines 54068 54080 +12
==========================================
+ Hits 29003 29006 +3
- Misses 22814 22820 +6
- Partials 2251 2254 +3
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
| bq.mu.Lock() | ||
| for { | ||
| for bq.running && len(bq.q) == 0 { | ||
| bq.cond.Wait() | ||
| } | ||
|
|
||
| if !bq.running { | ||
| close(bq.closed) | ||
| bq.closed = nil |
There was a problem hiding this comment.
Is setting this to nil necessary? Keep it closed, and replace it with a new one when restarted.
There was a problem hiding this comment.
receiving from nil blocks forever, and creating a chan and immediately closing it feels silly, so I like the nil checking
There was a problem hiding this comment.
Based on my suggestion, I expect that none of what you arguing should happen.
I must be missing something, can you please point to me when:
bq.closedwill be nil- where
bq.closedwill be created and immediately closed
ledger/blockqueue.go
Outdated
Comment on lines
67
to
73
| if bq.closed != nil { | ||
| // a previus close() is still waiting on a previous syncer() to finish | ||
| oldsyncer := bq.closed | ||
| bq.mu.Unlock() | ||
| <-oldsyncer | ||
| bq.mu.Lock() | ||
| } |
There was a problem hiding this comment.
If bq.closed is not set to nil, this can be simplified:
Suggested change
| if bq.closed != nil { | |
| // a previus close() is still waiting on a previous syncer() to finish | |
| oldsyncer := bq.closed | |
| bq.mu.Unlock() | |
| <-oldsyncer | |
| bq.mu.Lock() | |
| } | |
| // a previus close() is still waiting on a previous syncer() to finish | |
| bq.mu.Unlock() | |
| <-bq.closed | |
| bq.mu.Lock() |
algonautshant
previously approved these changes
Jan 13, 2023
ledger/blockqueue.go
Outdated
Comment on lines
69
to
72
| oldsyncer := bq.closed | ||
| bq.mu.Unlock() | ||
| <-oldsyncer | ||
| bq.mu.Lock() |
ledger/blockqueue.go
Outdated
| }() | ||
| defer bq.mu.Unlock() | ||
|
|
||
| if !bq.running { |
There was a problem hiding this comment.
Suggested change
| if !bq.running { | |
| if bq.running { | |
| // log a warning, we should not be restarting running block queue | |
| return | |
| } |
algorandskiy
approved these changes
Jan 18, 2023
This was referenced Jan 23, 2023
This was referenced Jan 30, 2023
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.
Summary
Rearrange blockqueue start/stop to be cleaner and never nil inside ledger.go
Bonus: Remove stale test interface
Test Plan
Passes local unit tests.