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

Synchronize peer data lookups.

Browse Source 
Without this we could broadcast the same data multiple times, due to more than one thread processing the same message from different peers.
This commit is contained in:
CalDescent 2021-10-29 17:46:58 +01:00
parent c63d238316
commit e7cb33d8e2
1 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/main/java/org/qortal/controller/arbitrary/ArbitraryDataManager.java
View File

@ -36,6 +36,7 @@ public class ArbitraryDataManager extends Thread {
private static final long ARBITRARY_REQUEST_TIMEOUT = 5 * 1000L; // ms
private static ArbitraryDataManager instance;
private final Object peerDataLock = new Object();
private boolean buildInProgress = false;
@ -679,39 +680,42 @@ public class ArbitraryDataManager extends Thread {
boolean containsNewEntry = false;
try (final Repository repository = RepositoryManager.getRepository()) {
for (byte[] signature : signatures) {
// Synchronize peer data lookups to make this process thread safe. Otherwise we could broadcast
// the same data multiple times, due to more than one thread processing the same message from different peers
synchronized (this.peerDataLock) {
try (final Repository repository = RepositoryManager.getRepository()) {
for (byte[] signature : signatures) {
// Check if a record already exists for this hash/peer combination
ArbitraryPeerData existingEntry = repository.getArbitraryRepository()
.getArbitraryPeerDataForSignatureAndPeer(signature, peer.getPeerData().getAddress().toString());
// Check if a record already exists for this hash/peer combination
ArbitraryPeerData existingEntry = repository.getArbitraryRepository()
.getArbitraryPeerDataForSignatureAndPeer(signature, peer.getPeerData().getAddress().toString());
if (existingEntry == null) {
// We haven't got a record of this mapping yet, so add it
LOGGER.info("Adding arbitrary peer: {} for signature {}", peerAddress, Base58.encode(signature));
ArbitraryPeerData arbitraryPeerData = new ArbitraryPeerData(signature, peer);
repository.getArbitraryRepository().save(arbitraryPeerData);
repository.saveChanges();
if (existingEntry == null) {
// We haven't got a record of this mapping yet, so add it
LOGGER.info("Adding arbitrary peer: {} for signature {}", peerAddress, Base58.encode(signature));
ArbitraryPeerData arbitraryPeerData = new ArbitraryPeerData(signature, peer);
repository.getArbitraryRepository().save(arbitraryPeerData);
repository.saveChanges();
// Remember that this data is new, so that it can be re-broadcast later
containsNewEntry = true;
// Remember that this data is new, so that it can be re-broadcast later
containsNewEntry = true;
}
}
}
// If at least one signature in this batch was new to us, we should re-broadcast the message to the
// network in case some peers haven't received it yet
if (containsNewEntry) {
LOGGER.info("Rebroadcasting arbitrary signature list for peer {}", peerAddress);
Network.getInstance().broadcast(broadcastPeer -> arbitrarySignaturesMessage);
}
else {
// Don't re-broadcast as otherwise we could get into a loop
}
// If at least one signature in this batch was new to us, we should re-broadcast the message to the
// network in case some peers haven't received it yet
if (containsNewEntry) {
LOGGER.info("Rebroadcasting arbitrary signature list for peer {}", peerAddress);
Network.getInstance().broadcast(broadcastPeer -> arbitrarySignaturesMessage);
} else {
// Don't re-broadcast as otherwise we could get into a loop
}
// If anything needed saving, it would already have called saveChanges() above
repository.discardChanges();
} catch (DataException e) {
LOGGER.error(String.format("Repository issue while processing arbitrary transaction signature list from peer %s", peer), e);
// If anything needed saving, it would already have called saveChanges() above
repository.discardChanges();
} catch (DataException e) {
LOGGER.error(String.format("Repository issue while processing arbitrary transaction signature list from peer %s", peer), e);
}
}
}