Skip to content

optimizing the logic of fast forward node #2329

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

Merged
merged 1 commit into from
Jun 25, 2019
Merged

optimizing the logic of fast forward node #2329

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
6 changes: 2 additions & 4 deletions src/main/java/org/tron/core/net/messagehandler/BlockMsgHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ public class BlockMsgHandler implements TronMsgHandler {

private int maxBlockSize = BLOCK_SIZE + 1000;

private int threshold = 3;

private boolean fastForward = Args.getInstance().isFastForward();

@Override
Expand Down Expand Up @@ -103,12 +101,12 @@ private void processBlock(PeerConnection peer, BlockCapsule block) throws P2pExc
}

Item item = new Item(blockId, InventoryType.BLOCK);
if (peer.isFastForwardPeer()) {
if (fastForward || peer.isFastForwardPeer()) {
advService.addInvToCache(item);
}

if (fastForward) {
if (tronNetDelegate.getHeadBlockId().getNum() - block.getNum() > threshold) {
if (block.getNum() < tronNetDelegate.getHeadBlockId().getNum()) {
logger.warn("Receive a low block {}, head {}",
blockId.getString(), tronNetDelegate.getHeadBlockId().getString());
return;
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/tron/core/net/service/AdvService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ synchronized public void addInvToCache(Item item) {

synchronized public boolean addInv(Item item) {

if (fastForward) {
if (fastForward && item.getType().equals(InventoryType.TRX)) {
return false;
}

Expand Down Expand Up @@ -252,7 +252,6 @@ synchronized private void consumerInvToSpread() {

List<PeerConnection> peers = tronNetDelegate.getActivePeer().stream()
.filter(peer -> !peer.isNeedSyncFromPeer() && !peer.isNeedSyncFromUs())
.filter(peer -> !peer.isFastForwardPeer())
.collect(Collectors.toList());

if (invToSpread.isEmpty() || peers.isEmpty()) {
Expand Down Expand Up @@ -310,6 +309,9 @@ public int getSize(PeerConnection peer) {

public void sendInv() {
send.forEach((peer, ids) -> ids.forEach((key, value) -> {
if (peer.isFastForwardPeer() && key.equals(InventoryType.TRX)) {
return;
}
if (key.equals(InventoryType.BLOCK)) {
value.sort(Comparator.comparingLong(value1 -> new BlockId(value1).getNum()));
}
Expand Down