Skip to content

fix(net): solve the problem of block repeating obtaining #4995

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 2 commits into from
Feb 15, 2023
Merged

fix(net): solve the problem of block repeating obtaining #4995

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5f9c6f
fix(net): solve the problem of obtaining the same block during block …
xxo1shine Feb 15, 2023
d585cf3
solve check style problem
xxo1shine Feb 15, 2023
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
17 changes: 10 additions & 7 deletions framework/src/main/java/org/tron/core/net/service/sync/SyncService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public class SyncService {
private Map<BlockMessage, PeerConnection> blockJustReceived = new ConcurrentHashMap<>();

private long blockCacheTimeout = Args.getInstance().getBlockCacheTimeout();
private Cache<BlockId, Long> requestBlockIds = CacheBuilder.newBuilder().maximumSize(10_000)
private Cache<BlockId, PeerConnection> requestBlockIds = CacheBuilder.newBuilder().maximumSize(10_000)
.expireAfterWrite(blockCacheTimeout, TimeUnit.MINUTES).initialCapacity(10_000)
.recordStats().build();

Expand Down Expand Up @@ -138,13 +138,16 @@ public void processBlock(PeerConnection peer, BlockMessage blockMessage) {

public void onDisconnect(PeerConnection peer) {
if (!peer.getSyncBlockRequested().isEmpty()) {
peer.getSyncBlockRequested().keySet().forEach(blockId -> invalid(blockId));
peer.getSyncBlockRequested().keySet().forEach(blockId -> invalid(blockId, peer));
}
}

private void invalid(BlockId blockId) {
requestBlockIds.invalidate(blockId);
fetchFlag = true;
private void invalid(BlockId blockId, PeerConnection peerConnection) {
PeerConnection p = requestBlockIds.getIfPresent(blockId);
if (peerConnection.equals(p)) {
requestBlockIds.invalidate(blockId);
fetchFlag = true;
}
}

private LinkedList<BlockId> getBlockChainSummary(PeerConnection peer) throws P2pException {
Expand Down Expand Up @@ -209,7 +212,7 @@ private void startFetchSyncBlock() {
}
for (BlockId blockId : peer.getSyncBlockToFetch()) {
if (requestBlockIds.getIfPresent(blockId) == null) {
requestBlockIds.put(blockId, System.currentTimeMillis());
requestBlockIds.put(blockId, peer);
peer.getSyncBlockRequested().put(blockId, System.currentTimeMillis());
send.get(peer).add(blockId);
if (send.get(peer).size() >= MAX_BLOCK_FETCH_PER_PEER) {
Expand Down Expand Up @@ -243,7 +246,7 @@ private synchronized void handleSyncBlock() {
synchronized (tronNetDelegate.getBlockLock()) {
if (peerConnection.isDisconnect()) {
blockWaitToProcess.remove(msg);
invalid(msg.getBlockId());
invalid(msg.getBlockId(), peerConnection);
return;
}
final boolean[] isFound = {false};
Expand Down