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.

Sign up for GitHub

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

Revert "Fix Round Robin Test" #3823

Merged
merged 1 commit into from
Oct 22, 2019
Merged

Revert "Fix Round Robin Test" #3823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions beacon-chain/sync/initial-sync/round_robin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,18 +70,9 @@ func (s *InitialSync) roundRobinSync(genesis time.Time) error {
if ctx.Err() != nil {
return nil, ctx.Err()
}

originalStart := start
originalCount := count
start := start + uint64(i)*step
step := step * uint64(len(peers))
count := mathutil.Min(count, (helpers.StartSlot(finalizedEpoch+1)-originalStart)/step)
// If there is only 1 peer left, rather than further minimising the count in the situation
// of a large step value. we remove the variable entirely. This also handles the case if
// there is only 1 peer overall(step = 1).
if len(peers) == 1 {
count = mathutil.Min(originalCount, helpers.StartSlot(finalizedEpoch+1)-originalStart)
}
count := mathutil.Min(count, (helpers.StartSlot(finalizedEpoch+1)-start)/step)
// If the count was divided by an odd number of peers, there will be some blocks
// missing from the first requests so we accommodate that scenario.
if i < remainder {
Expand Down
61 changes: 31 additions & 30 deletions beacon-chain/sync/initial-sync/round_robin_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,36 +136,37 @@ func TestRoundRobinSync(t *testing.T) {
},
},

{
name: "Multiple peers with multiple failures",
currentSlot: 320, // 5 epochs
expectedBlockSlots: makeSequence(1, 320),
peers: []*peerData{
{
blocks: makeSequence(1, 320),
finalizedEpoch: 4,
headSlot: 320,
},
{
blocks: makeSequence(1, 320),
finalizedEpoch: 4,
headSlot: 320,
failureSlots: makeSequence(1, 320),
},
{
blocks: makeSequence(1, 320),
finalizedEpoch: 4,
headSlot: 320,
failureSlots: makeSequence(1, 320),
},
{
blocks: makeSequence(1, 320),
finalizedEpoch: 4,
headSlot: 320,
failureSlots: makeSequence(1, 320),
},
},
},
// TODO(3147): Handle multiple failures.
//{
// name: "Multiple peers with multiple failures",
// currentSlot: 320, // 5 epochs
// expectedBlockSlots: makeSequence(1, 320),
// peers: []*peerData{
// {
// blocks: makeSequence(1, 320),
// finalizedEpoch: 4,
// headSlot: 320,
// },
// {
// blocks: makeSequence(1, 320),
// finalizedEpoch: 4,
// headSlot: 320,
// failureSlots: makeSequence(1, 320),
// },
// {
// blocks: makeSequence(1, 320),
// finalizedEpoch: 4,
// headSlot: 320,
// failureSlots: makeSequence(1, 320),
// },
// {
// blocks: makeSequence(1, 320),
// finalizedEpoch: 4,
// headSlot: 320,
// failureSlots: makeSequence(1, 320),
// },
// },
//},
{
name: "Multiple peers with different finalized epoch",
currentSlot: 320, // 5 epochs
Expand Down