-
Notifications
You must be signed in to change notification settings - Fork 208
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
[Merged by Bors] - fetch: requests got lost when there are no peers #4849
Closed
countvonzero
wants to merge
6
commits into
spacemeshos:develop
from
countvonzero:get-out-of-black-hole
Closed
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
d8d582a
fix fetch black hole
countvonzero 99820cf
allow progress despite missing blocks
countvonzero f9cd033
improve test
countvonzero c2444b3
error out instead of waiting
countvonzero 6ffe35b
fix test
countvonzero ccf3e0b
restore update min when there are missing blocks
countvonzero File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -404,6 +404,20 @@ func TestProcessLayer(t *testing.T) { | |
}, | ||
}, | ||
}, | ||
{ | ||
"missing but can make progress", | ||
[]call{ | ||
{ | ||
updates: rlayers( | ||
rlayer(start, rblock(idg("1"), fixture.Valid(), fixture.Data())), | ||
rlayer(start+1, rblock(idg("2"), fixture.Valid(), fixture.Data())), | ||
rlayer(start+2, rblock(idg("3"), fixture.Valid())), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. maybe extend it with one more block with data? and one more call that both got applied There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. done |
||
), | ||
executed: []types.BlockID{idg("1"), idg("2")}, | ||
applied: []types.BlockID{idg("1"), idg("2")}, | ||
}, | ||
}, | ||
}, | ||
{ | ||
"missing valid", | ||
[]call{ | ||
|
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
so GetBlocks will not return immediately with error if no peers, but instead we will do the request when peers are available?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes. essentially put those requests back to the queue
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you prefer to fail all in that case?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
this approach is fine for me too, hard to tell what is better
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
actually i prefer returning error right away. it's easier for debugging (and avoiding future bug)