concurrency-solid version of transmission limitation

pull/1/head
orbiter 11 years ago
parent ec21f0494e
commit a07e9b3582

@ -401,7 +401,7 @@ public class Dispatcher {
public Transmission.Chunk transferDocumentIndex(final Transmission.Chunk chunk) { public Transmission.Chunk transferDocumentIndex(final Transmission.Chunk chunk) {
// try to keep the system healthy; sleep as long as System load is too high // try to keep the system healthy; sleep as long as System load is too high
while (Protocol.metadataRetrievalRunning) try {Thread.sleep(1000);} catch (InterruptedException e) {break;} while (Protocol.metadataRetrievalRunning.get() > 0) try {Thread.sleep(1000);} catch (InterruptedException e) {break;}
while (Memory.load() > 2.0) try {Thread.sleep(10000);} catch (InterruptedException e) {break;} while (Memory.load() > 2.0) try {Thread.sleep(10000);} catch (InterruptedException e) {break;}
// do the transmission // do the transmission

@ -56,6 +56,7 @@ import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.TreeMap; import java.util.TreeMap;
import java.util.concurrent.atomic.AtomicInteger;
import net.yacy.migration; import net.yacy.migration;
import net.yacy.cora.date.GenericFormatter; import net.yacy.cora.date.GenericFormatter;
@ -1327,7 +1328,7 @@ public final class Protocol {
} }
} }
public static boolean metadataRetrievalRunning = false; public static AtomicInteger metadataRetrievalRunning = new AtomicInteger(0);
/** /**
* transfer the index. If the transmission fails, return a string describing the cause. If everything is * transfer the index. If the transmission fails, return a string describing the cause. If everything is
@ -1408,7 +1409,7 @@ public final class Protocol {
// other transmissions should not be started as long as this is running // other transmissions should not be started as long as this is running
final URIMetadataNode[] urls = new URIMetadataNode[uhs.length]; final URIMetadataNode[] urls = new URIMetadataNode[uhs.length];
byte[] key; byte[] key;
metadataRetrievalRunning = true; metadataRetrievalRunning.incrementAndGet();
for (int i = 0; i < uhs.length; i++) { for (int i = 0; i < uhs.length; i++) {
key = ASCII.getBytes(uhs[i]); key = ASCII.getBytes(uhs[i]);
if (urlRefs.has(key)) urls[i] = segment.fulltext().getMetadata(key); if (urlRefs.has(key)) urls[i] = segment.fulltext().getMetadata(key);
@ -1416,7 +1417,7 @@ public final class Protocol {
if (Network.log.isFine()) Network.log.fine("DEBUG transferIndex: requested url hash '" + uhs[i] + "', unknownURL='" + uhss + "'"); if (Network.log.isFine()) Network.log.fine("DEBUG transferIndex: requested url hash '" + uhs[i] + "', unknownURL='" + uhss + "'");
} }
} }
metadataRetrievalRunning = false; metadataRetrievalRunning.decrementAndGet();
in = transferURL(targetSeed, urls, gzipBody, timeout); in = transferURL(targetSeed, urls, gzipBody, timeout);

Loading…
Cancel
Save