Skip to content
This repository was archived by the owner on Dec 5, 2024. It is now read-only.

Fix/rc active peers #1120

Merged
merged 3 commits into from
Jul 6, 2018
Merged

Fix/rc active peers #1120

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
7503803
Fix RC in ChannelManager: notifyDisconnect vs processNewPeers
mkalinin Jul 5, 2018
d0365cb
Abort message queueing if peer was disconnected
mkalinin Jul 5, 2018
051fd73
Synchronize only local data modification. No outer calls under locks
Nashatyrev Jul 6, 2018
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
5 changes: 5 additions & 0 deletions ethereumj-core/src/main/java/org/ethereum/net/MessageQueue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,11 @@ public void setChannel(Channel channel) {
}

public void sendMessage(Message msg) {
if (channel.isDisconnected()) {
logger.warn("{}: attempt to send [{}] message after disconnect", channel, msg.getCommand().name());
return;
}

if (msg instanceof PingMessage) {
if (hasPing) return;
hasPing = true;
Expand Down
56 changes: 31 additions & 25 deletions ethereumj-core/src/main/java/org/ethereum/net/server/ChannelManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,44 +154,48 @@ public Set<String> nodesInUse() {
}

private void processNewPeers() {
if (newPeers.isEmpty()) return;
List<Runnable> noLockTasks = new ArrayList<>();

List<Channel> processed = new ArrayList<>();
synchronized (this) {
if (newPeers.isEmpty()) return;

int addCnt = 0;
for(Channel peer : newPeers) {
List<Channel> processed = new ArrayList<>();
int addCnt = 0;
for (Channel peer : newPeers) {

logger.debug("Processing new peer: " + peer);
logger.debug("Processing new peer: " + peer);

if(peer.isProtocolsInitialized()) {
if (peer.isProtocolsInitialized()) {

logger.debug("Protocols initialized");
logger.debug("Protocols initialized");

if (!activePeers.containsKey(peer.getNodeIdWrapper())) {
if (!peer.isActive() &&
activePeers.size() >= maxActivePeers &&
!trustedPeers.accept(peer.getNode())) {
if (!activePeers.containsKey(peer.getNodeIdWrapper())) {
if (!peer.isActive() &&
activePeers.size() >= maxActivePeers &&
!trustedPeers.accept(peer.getNode())) {

// restricting inbound connections unless this is a trusted peer
// restricting inbound connections unless this is a trusted peer

disconnect(peer, TOO_MANY_PEERS);
noLockTasks.add(() -> disconnect(peer, TOO_MANY_PEERS));
} else {
process(peer);
}
} else {
process(peer);
addCnt++;
noLockTasks.add(() -> disconnect(peer, DUPLICATE_PEER));
}
} else {
disconnect(peer, DUPLICATE_PEER);

processed.add(peer);
}
}

processed.add(peer);
if (addCnt > 0) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

addCnt is not used anymore in this code

logger.info("New peers processed: " + processed + ", active peers added: " + addCnt + ", total active peers: " + activePeers.size());
}
}

if (addCnt > 0) {
logger.info("New peers processed: " + processed + ", active peers added: " + addCnt + ", total active peers: " + activePeers.size());
newPeers.removeAll(processed);
}

newPeers.removeAll(processed);
noLockTasks.forEach(Runnable::run);
}

public void disconnect(Channel peer, ReasonCode reason) {
Expand Down Expand Up @@ -339,7 +343,7 @@ private void sendNewBlock(Block block, Channel receivedFrom) {
}
}

public void add(Channel peer) {
public synchronized void add(Channel peer) {
logger.debug("New peer in ChannelManager {}", peer);
newPeers.add(peer);
}
Expand All @@ -348,8 +352,10 @@ public void notifyDisconnect(Channel channel) {
logger.debug("Peer {}: notifies about disconnect", channel);
channel.onDisconnect();
syncPool.onDisconnect(channel);
activePeers.values().remove(channel);
newPeers.remove(channel);
synchronized(this) {
activePeers.values().remove(channel);
newPeers.remove(channel);
}
}

public void onSyncDone(boolean done) {
Expand Down