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

Fix race condition between Network.start() and Controller calling Network.prunePeers()

Browse Source 
Modified synchronized Lists to be final.
Moved some initializers out of constructor.
This commit is contained in:
catbref 2020-08-13 13:45:06 +01:00
parent f61e320230
commit 2165c87b9d
1 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/org/qortal/network/Network.java
View File

@ -50,7 +50,6 @@ import org.qortal.repository.DataException;
import org.qortal.repository.Repository; import org.qortal.repository.Repository;
import org.qortal.repository.RepositoryManager; import org.qortal.repository.RepositoryManager;
import org.qortal.settings.Settings; import org.qortal.settings.Settings;
import org.qortal.transform.Transformer;
import org.qortal.utils.ExecuteProduceConsume; import org.qortal.utils.ExecuteProduceConsume;
// import org.qortal.utils.ExecutorDumper; // import org.qortal.utils.ExecutorDumper;
import org.qortal.utils.ExecuteProduceConsume.StatsSnapshot; import org.qortal.utils.ExecuteProduceConsume.StatsSnapshot;
@ -91,15 +90,16 @@ public class Network {
public static final int MAX_SIGNATURES_PER_REPLY = 500; public static final int MAX_SIGNATURES_PER_REPLY = 500;
public static final int MAX_BLOCK_SUMMARIES_PER_REPLY = 500; public static final int MAX_BLOCK_SUMMARIES_PER_REPLY = 500;
private final Ed25519PrivateKeyParameters edPrivateKeyParams; // Generate our node keys / ID
private final Ed25519PublicKeyParameters edPublicKeyParams; private final Ed25519PrivateKeyParameters edPrivateKeyParams = new Ed25519PrivateKeyParameters(new SecureRandom());
private final String ourNodeId; private final Ed25519PublicKeyParameters edPublicKeyParams = edPrivateKeyParams.generatePublicKey();
private final String ourNodeId = Crypto.toNodeAddress(edPublicKeyParams.getEncoded());
private final int maxMessageSize; private final int maxMessageSize;
private List<PeerData> allKnownPeers; private final List<PeerData> allKnownPeers = new ArrayList<>();
private List<Peer> connectedPeers; private final List<Peer> connectedPeers = new ArrayList<>();
private List<PeerAddress> selfPeers; private final List<PeerAddress> selfPeers = new ArrayList<>();
private ExecuteProduceConsume networkEPC; private ExecuteProduceConsume networkEPC;
private Selector channelSelector; private Selector channelSelector;
@ -108,39 +108,21 @@ public class Network {
private int minOutboundPeers; private int minOutboundPeers;
private int maxPeers; private int maxPeers;
private long nextConnectTaskTimestamp; private long nextConnectTaskTimestamp = 0L; // ms - try first connect once NTP syncs
private ExecutorService broadcastExecutor; private ExecutorService broadcastExecutor = Executors.newCachedThreadPool();
private long nextBroadcastTimestamp; private long nextBroadcastTimestamp = 0L; // ms - try first broadcast once NTP syncs
private Lock mergePeersLock; private final Lock mergePeersLock = new ReentrantLock();
// Constructors // Constructors
private Network() { private Network() {
connectedPeers = new ArrayList<>();
selfPeers = new ArrayList<>();
// Generate our ID
byte[] seed = new byte[Transformer.PRIVATE_KEY_LENGTH];
new SecureRandom().nextBytes(seed);
edPrivateKeyParams = new Ed25519PrivateKeyParameters(seed, 0);
edPublicKeyParams = edPrivateKeyParams.generatePublicKey();
ourNodeId = Crypto.toNodeAddress(edPublicKeyParams.getEncoded());
maxMessageSize = 4 + 1 + 4 + BlockChain.getInstance().getMaxBlockSize(); maxMessageSize = 4 + 1 + 4 + BlockChain.getInstance().getMaxBlockSize();
minOutboundPeers = Settings.getInstance().getMinOutboundPeers(); minOutboundPeers = Settings.getInstance().getMinOutboundPeers();
maxPeers = Settings.getInstance().getMaxPeers(); maxPeers = Settings.getInstance().getMaxPeers();
nextConnectTaskTimestamp = 0; // First connect once NTP syncs
broadcastExecutor = Executors.newCachedThreadPool();
nextBroadcastTimestamp = 0; // First broadcast once NTP syncs
mergePeersLock = new ReentrantLock();
// We'll use a cached thread pool but with more aggressive timeout. // We'll use a cached thread pool but with more aggressive timeout.
ExecutorService networkExecutor = new ThreadPoolExecutor(1, ExecutorService networkExecutor = new ThreadPoolExecutor(1,
Settings.getInstance().getMaxNetworkThreadPoolSize(), Settings.getInstance().getMaxNetworkThreadPoolSize(),
@ -177,7 +159,9 @@ public class Network {
// Load all known peers from repository // Load all known peers from repository
try (final Repository repository = RepositoryManager.getRepository()) { try (final Repository repository = RepositoryManager.getRepository()) {
allKnownPeers = repository.getNetworkRepository().getAllPeers(); synchronized (this.allKnownPeers) {
this.allKnownPeers.addAll(repository.getNetworkRepository().getAllPeers());
}
} }
// Start up first networking thread // Start up first networking thread