diff options
| author | pr0vieh <pr0vieh@gmail.com> | 2023-12-03 01:27:36 +0100 |
|---|---|---|
| committer | pr0vieh <pr0vieh@gmail.com> | 2023-12-03 01:27:36 +0100 |
| commit | dfb2b796090c78f5e4f5165b7c6ced69b4ad633c (patch) | |
| tree | 786eb00fdc737b34e2aefa50a580fd76329965ef | |
| parent | 4c603e23f07569610714327e7e4bca1ec9f5bbaa (diff) | |
Add setting for DHT receive loadprereq insted of hardcoded load < 2.0
| -rw-r--r-- | defaults/yacy.init | 1 | ||||
| -rw-r--r-- | source/net/yacy/htroot/yacy/transferRWI.java | 3 | ||||
| -rw-r--r-- | source/net/yacy/search/SwitchboardConstants.java | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/defaults/yacy.init b/defaults/yacy.init index cb6fb5f6b..c1f0b40cc 100644 --- a/defaults/yacy.init +++ b/defaults/yacy.init @@ -691,6 +691,7 @@ collection=user 20_dhtdistribution_busysleep=15000
20_dhtdistribution_memprereq=12582912
20_dhtdistribution_loadprereq=2.0
+20_dhtreceive_loadprereq=2.0
30_peerping_idlesleep=30000
30_peerping_busysleep=30000
30_peerping_memprereq=2097152
diff --git a/source/net/yacy/htroot/yacy/transferRWI.java b/source/net/yacy/htroot/yacy/transferRWI.java index aaab64a52..0981ff70e 100644 --- a/source/net/yacy/htroot/yacy/transferRWI.java +++ b/source/net/yacy/htroot/yacy/transferRWI.java @@ -102,7 +102,8 @@ public final class transferRWI { return prop;
}
// load tests
- if (Memory.getSystemLoadAverage() > 2.0 || MemoryControl.shortStatus()) {
+ final float maxReceiveLoad = sb.getConfigFloat(SwitchboardConstants.INDEX_RECEIVE_LOADPREREQ, 2.0f);
+ if (Memory.getSystemLoadAverage() > maxReceiveLoad || MemoryControl.shortStatus()) {
// check also Protocol.metadataRetrievalRunning.get() > 0 ?
result = "too high load"; // don't tell too much details
prop.put("result", result);
diff --git a/source/net/yacy/search/SwitchboardConstants.java b/source/net/yacy/search/SwitchboardConstants.java index fedef45e7..39b2d2638 100644 --- a/source/net/yacy/search/SwitchboardConstants.java +++ b/source/net/yacy/search/SwitchboardConstants.java @@ -82,6 +82,7 @@ public final class SwitchboardConstants { public static final String INDEX_DIST_LOADPREREQ = "20_dhtdistribution_loadprereq"; public static final String INDEX_DIST_IDLESLEEP = "20_dhtdistribution_idlesleep"; public static final String INDEX_DIST_BUSYSLEEP = "20_dhtdistribution_busysleep"; + public static final String INDEX_RECEIVE_LOADPREREQ = "20_dhtreceive_loadprereq"; // 30_peerping /** * <p><code>public static final String <strong>PEER_PING</strong> = "30_peerping"</code></p> |