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

Track the request time in arbitraryDataFileRequests and automatically remove those that have timed out.

Browse Source
This commit is contained in:
CalDescent 2021-07-11 10:28:14 +01:00
parent 483557163e
commit 00d4f35f2c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/qortal/controller/ArbitraryDataManager.java
View File

@ -53,9 +53,9 @@ public class ArbitraryDataManager extends Thread {
public Map<Integer, Triple<String, Peer, Long>> arbitraryDataFileListRequests = Collections.synchronizedMap(new HashMap<>()); public Map<Integer, Triple<String, Peer, Long>> arbitraryDataFileListRequests = Collections.synchronizedMap(new HashMap<>());
/** /**
* Array to keep track of in progress arbitrary data file requests * Map to keep track of in progress arbitrary data file requests
*/ */
private List<Object> arbitraryDataFileRequests = Collections.synchronizedList(new ArrayList<>()); private Map<String, Long> arbitraryDataFileRequests = Collections.synchronizedMap(new HashMap<>());
private ArbitraryDataManager() { private ArbitraryDataManager() {
} }
@ -169,7 +169,7 @@ public class ArbitraryDataManager extends Thread {
private DataFile fetchArbitraryDataFile(Peer peer, byte[] hash) throws InterruptedException { private DataFile fetchArbitraryDataFile(Peer peer, byte[] hash) throws InterruptedException {
String hash58 = Base58.encode(hash); String hash58 = Base58.encode(hash);
LOGGER.info(String.format("Fetching data file %.8s from peer %s", hash58, peer)); LOGGER.info(String.format("Fetching data file %.8s from peer %s", hash58, peer));
arbitraryDataFileRequests.add(hash58); arbitraryDataFileRequests.put(hash58, NTP.getTime());
Message getDataFileMessage = new GetDataFileMessage(hash); Message getDataFileMessage = new GetDataFileMessage(hash);
Message message = peer.getResponse(getDataFileMessage); Message message = peer.getResponse(getDataFileMessage);
@ -187,8 +187,7 @@ public class ArbitraryDataManager extends Thread {
public void cleanupRequestCache(long now) { public void cleanupRequestCache(long now) {
final long requestMinimumTimestamp = now - ARBITRARY_REQUEST_TIMEOUT; final long requestMinimumTimestamp = now - ARBITRARY_REQUEST_TIMEOUT;
arbitraryDataFileListRequests.entrySet().removeIf(entry -> entry.getValue().getC() < requestMinimumTimestamp); arbitraryDataFileListRequests.entrySet().removeIf(entry -> entry.getValue().getC() < requestMinimumTimestamp);
arbitraryDataFileRequests.entrySet().removeIf(entry -> entry.getValue() < requestMinimumTimestamp);
// TODO: cleanup arbitraryDataFileRequests
} }
@ -290,7 +289,7 @@ public class ArbitraryDataManager extends Thread {
for (byte[] hash : hashes) { for (byte[] hash : hashes) {
if (!dataFile.chunkExists(hash)) { if (!dataFile.chunkExists(hash)) {
// Only request the file if we aren't already requesting it from someone else // Only request the file if we aren't already requesting it from someone else
if (!arbitraryDataFileRequests.contains(Base58.encode(hash))) { if (!arbitraryDataFileRequests.containsKey(Base58.encode(hash))) {
DataFile receivedDataFile = fetchArbitraryDataFile(peer, hash); DataFile receivedDataFile = fetchArbitraryDataFile(peer, hash);
LOGGER.info("Received data file {} from peer {}", receivedDataFile, peer); LOGGER.info("Received data file {} from peer {}", receivedDataFile, peer);
} }