Skip to content

optimize granularity of blockLock #4536

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
317787106 merged 2 commits into from
Jul 28, 2022
Merged

optimize granularity of blockLock #4536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee8f9ae
optimize blockLock; MessageQueue does not send message if channel is …
317787106 Jul 14, 2022
6ccb554
rollback
317787106 Jul 18, 2022
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
16 changes: 8 additions & 8 deletions framework/src/main/java/org/tron/common/overlay/server/ChannelManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
@Component
public class ChannelManager {

private final Map<ByteArrayWrapper, Channel> activePeers = new ConcurrentHashMap<>();
private final Map<ByteArrayWrapper, Channel> activeChannels = new ConcurrentHashMap<>();
@Autowired
private PeerServer peerServer;
@Autowired
Expand Down Expand Up @@ -121,7 +121,7 @@ public void processDisconnect(Channel channel, ReasonCode reason) {

public void notifyDisconnect(Channel channel) {
syncPool.onDisconnect(channel);
activePeers.values().remove(channel);
activeChannels.values().remove(channel);
if (channel != null) {
if (channel.getNodeStatistics() != null) {
channel.getNodeStatistics().notifyDisconnect();
Expand All @@ -146,7 +146,7 @@ public synchronized boolean processPeer(Channel peer) {
return false;
}

if (!peer.isActive() && activePeers.size() >= maxActivePeers) {
if (!peer.isActive() && activeChannels.size() >= maxActivePeers) {
peer.disconnect(TOO_MANY_PEERS);
return false;
}
Expand All @@ -157,7 +157,7 @@ public synchronized boolean processPeer(Channel peer) {
}
}

Channel channel = activePeers.get(peer.getNodeIdWrapper());
Channel channel = activeChannels.get(peer.getNodeIdWrapper());
if (channel != null) {
if (channel.getStartTime() > peer.getStartTime()) {
logger.info("Disconnect connection established later, {}", channel.getNode());
Expand All @@ -167,14 +167,14 @@ public synchronized boolean processPeer(Channel peer) {
return false;
}
}
activePeers.put(peer.getNodeIdWrapper(), peer);
logger.info("Add active peer {}, total active peers: {}", peer, activePeers.size());
activeChannels.put(peer.getNodeIdWrapper(), peer);
logger.info("Add active peer {}, total active peers: {}", peer, activeChannels.size());
return true;
}

public int getConnectionNum(InetAddress inetAddress) {
int cnt = 0;
for (Channel channel : activePeers.values()) {
for (Channel channel : activeChannels.values()) {
if (channel.getInetAddress().equals(inetAddress)) {
cnt++;
}
Expand All @@ -183,7 +183,7 @@ public int getConnectionNum(InetAddress inetAddress) {
}

public Collection<Channel> getActivePeers() {
return activePeers.values();
return activeChannels.values();
}

public Cache<InetAddress, ReasonCode> getRecentlyDisconnected() {
Expand Down
8 changes: 4 additions & 4 deletions framework/src/main/java/org/tron/core/net/service/SyncService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,8 +234,8 @@ private synchronized void handleSyncBlock() {

isProcessed[0] = false;

synchronized (tronNetDelegate.getBlockLock()) {
blockWaitToProcess.forEach((msg, peerConnection) -> {
blockWaitToProcess.forEach((msg, peerConnection) -> {
synchronized (tronNetDelegate.getBlockLock()) {
if (peerConnection.isDisconnect()) {
blockWaitToProcess.remove(msg);
invalid(msg.getBlockId());
Expand All @@ -254,8 +254,8 @@ private synchronized void handleSyncBlock() {
isProcessed[0] = true;
processSyncBlock(msg.getBlockCapsule());
}
});
}
}
});
}
}

Expand Down