AlphaX/qortal
1
0
Fork 0
forked from Qortal/qortal
Code Issues Pull Requests Projects Releases Wiki Activity

Improve Network.shutdown() and logging in Peer.

Browse Source 
Network.shutdown() called Peer.shutdown() on each Peer
while holding synchronization lock on this.connectedPeers.

This would cause a problem during Peer.shutdown() as some
other reachable code would also want synchronized access
to this.connectedPeers. Typical symptoms would be log
entries like:

2019-07-02 11:13:05 DEBUG Peer:512 - Message processor for peer 192.144.182.73:9889 failed to terminate

Eventually Network.shutdown() would exit, releasing synchronization
lock and awaking stuck Peer threads, which could then try to access
repository (now closed) causing further log spam.

Now it uses Network.getConnectedPeers to return duplicated
List<Peer>, minimizing lock time on this.connectedPeers.

Also made Peer main thread logging more informative when a IOException
occurs, as most situations are harmless EOF or connection reset by peer.
This commit is contained in:
catbref 2019-07-02 12:14:32 +01:00
parent 192a072796
commit 7b51b1e88d
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/qora/network/Network.java
View File

@ -963,10 +963,8 @@ public class Network extends Thread {
}
// Close all peer connections
synchronized (this.connectedPeers) {
for (Peer peer : this.connectedPeers)
peer.shutdown();
}
for (Peer peer : this.getConnectedPeers())
peer.shutdown();
}
}

15
src/main/java/org/qora/network/Peer.java
View File

@ -1,6 +1,7 @@
package org.qora.network;
import java.io.DataInputStream;
import java.io.EOFException;
import java.io.IOException;
import java.io.OutputStream;
import java.net.InetAddress;
@ -369,10 +370,20 @@ public class Peer extends Thread {
} catch (SocketTimeoutException e) {
this.disconnect("timeout");
} catch (IOException e) {
if (isStopping)
if (isStopping) {
// If isStopping is true then our shutdown() has already been called, so no need to call it again
LOGGER.debug(String.format("Peer %s stopping...", this));
else
return;
}
// More informative logging
if (e instanceof EOFException) {
this.disconnect("EOF");
} else if (e.getMessage().contains("onnection reset")) { // Can't import/rely on sun.net.ConnectionResetException
this.disconnect("Connection reset");
} else {
this.disconnect("I/O error");
}
} finally {
Thread.currentThread().setName("disconnected peer");
}