Skip to content

feat(net): solve the problem of concurrent access to fields of PeerConnection #6360

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
kuny0707 merged 3 commits into from
Aug 7, 2025
Merged

feat(net): solve the problem of concurrent access to fields of PeerConnection #6360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5304d55
feat(net): add volatile modifier to peer attribute variables
zeusoo001 Jun 24, 2025
017207e
feat(net): adjust the order of field assignment to solve concurrency …
zeusoo001 Jul 3, 2025
bae51b0
Merge branch 'release_v4.8.1' of github.com:tronprotocol/java-tron in…
zeusoo001 Jul 11, 2025
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
10 changes: 5 additions & 5 deletions framework/src/main/java/org/tron/core/net/peer/PeerConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ public class PeerConnection {

@Getter
@Setter
private TronState tronState = TronState.INIT;
private volatile TronState tronState = TronState.INIT;

@Autowired
private TronNetDelegate tronNetDelegate;
Expand Down Expand Up @@ -123,15 +123,15 @@ public class PeerConnection {
private Map<Item, Long> advInvRequest = new ConcurrentHashMap<>();

@Setter
private BlockId fastForwardBlock;
private volatile BlockId fastForwardBlock;

@Getter
private BlockId blockBothHave = new BlockId();
private volatile BlockId blockBothHave = new BlockId();
@Getter
private volatile long blockBothHaveUpdateTime = System.currentTimeMillis();
@Setter
@Getter
private BlockId lastSyncBlockId;
private volatile BlockId lastSyncBlockId;
@Setter
@Getter
private volatile long remainNum;
Expand All @@ -146,7 +146,7 @@ public class PeerConnection {
private Map<BlockId, Long> syncBlockRequested = new ConcurrentHashMap<>();
@Setter
@Getter
Copy link
Copy Markdown
Contributor

@Sunny6889 Sunny6889 Jul 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why syncBlockToFetch here not add this volatile, as you change the logic order at SyncService.java

Copy link
Copy Markdown
Collaborator

@xxo1shine xxo1shine Jul 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This field does not have a second assignment, so it does not need to be modified by volatile.

private Pair<Deque<BlockId>, Long> syncChainRequested = null;
private volatile Pair<Deque<BlockId>, Long> syncChainRequested = null;
@Setter
@Getter
private Set<BlockId> syncBlockInProcess = new HashSet<>();
Expand Down
5 changes: 2 additions & 3 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 @@ -159,9 +159,8 @@ private void invalid(BlockId blockId, PeerConnection peerConnection) {
}

private LinkedList<BlockId> getBlockChainSummary(PeerConnection peer) throws P2pException {

BlockId beginBlockId = peer.getBlockBothHave();
List<BlockId> blockIds = new ArrayList<>(peer.getSyncBlockToFetch());
BlockId beginBlockId = peer.getBlockBothHave();
List<BlockId> forkList = new LinkedList<>();
LinkedList<BlockId> summary = new LinkedList<>();
long syncBeginNumber = tronNetDelegate.getSyncBeginNumber();
Expand Down Expand Up @@ -323,9 +322,9 @@ private void processSyncBlock(BlockCapsule block, PeerConnection peerConnection)
for (PeerConnection peer : tronNetDelegate.getActivePeer()) {
BlockId bid = peer.getSyncBlockToFetch().peek();
if (blockId.equals(bid)) {
peer.setBlockBothHave(blockId);
peer.getSyncBlockToFetch().remove(bid);
if (flag) {
peer.setBlockBothHave(blockId);
if (peer.getSyncBlockToFetch().isEmpty() && peer.isFetchAble()) {
syncNext(peer);
}
Expand Down