Skip to content
This repository has been archived by the owner on Sep 26, 2019. It is now read-only.

[NC-2236] Parallel Block importer #774

Merged
merged 20 commits into from
Feb 8, 2019
Merged

[NC-2236] Parallel Block importer #774

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
7a6adc1
Parallel Block importer
shemnon Feb 5, 2019
e29f79c
Move ethTaskTimer to abstract root
shemnon Feb 5, 2019
5718db5
spotless and errorprone
shemnon Feb 5, 2019
fa800aa
Merge branch 'master' of github.com:PegaSysEng/pantheon into parallel…
shemnon Feb 5, 2019
1817e87
hack to get us past unit tests.
shemnon Feb 5, 2019
bbb4aec
merge from main
shemnon Feb 5, 2019
2941970
bug fixes
shemnon Feb 6, 2019
082549c
* remove CompletableFuture.allOf and wait on each. .allOf(...) doesn't
shemnon Feb 7, 2019
7cf5790
Merge branch 'master' of github.com:PegaSysEng/pantheon into parallel…
shemnon Feb 7, 2019
494b9df
spotless
shemnon Feb 7, 2019
d7bb3d4
increase timeout in recoversFromSyncTargetDisconnect, the chain downl…
shemnon Feb 7, 2019
727a24d
merge
shemnon Feb 7, 2019
dc65fd8
un-wedge the tests.
shemnon Feb 7, 2019
f8a0ca0
spotless
shemnon Feb 7, 2019
0c7a625
Use a blocking queue instead of fixed wait period.
ajsutton Feb 7, 2019
6db15d3
Merge pull request #1 from ajsutton/parallel_blocks
shemnon Feb 8, 2019
6126116
review updates.
shemnon Feb 8, 2019
9a559cf
drop semi-colon
shemnon Feb 8, 2019
c85f36f
Merge branch 'master' of github.com:PegaSysEng/pantheon into parallel…
shemnon Feb 8, 2019
f9a4694
restore missing header
shemnon Feb 8, 2019
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
Prev Previous commit
Next Next commit
spotless
  • Loading branch information
@shemnon
shemnon committed Feb 7, 2019
commit 494b9df2c6ba81f833ec3df227eb671f437f5157
5 changes: 1 addition & 4 deletions ...in/java/tech/pegasys/pantheon/ethereum/eth/sync/tasks/ParallelImportChainSegmentTask.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,10 +175,7 @@ protected void executeTask() {
if (r != null) {
try {
final List<B> importedBlocks =
validateBodiesFuture
.get()
.getResult()
.stream()
validateBodiesFuture.get().getResult().stream()
.flatMap(Collection::stream)
.collect(Collectors.toList());
result.get().complete(importedBlocks);
Expand Down