Replace RequestStarter throttling with simplier logic

Trivuele · ArneBab · commit ad422a7396b0 · 2022-06-04T11:32:12.000+02:00
The RequestStarter logic was subtly broken in multiple ways:
- Bad interaction between rtt and window estimates would cause your
  node to oscillate between starting way more requests than the
  network can handle and almost stalling entirely for minutes.
  The speed difference may be a factor 100x from one minute to another.
- Nodes patched with the infamous RequestStarter patches would cause
  your node to throttle down on number of requests started to their
  advantage. This could potentially be exploited by an attacker as well.
- The window estimation would attempt to throttle the speed to target
  a certain ratio of requests succeeding without getting dropped due
  to rejected-overload. This would avoid meltdown of the network, but
  the target was not hard-coded but dependant on average network speed
  among other things, in practice ending up allowing 30% of requests
  to fail.
- The window estimation was changed according to an AIMD schedule.
  This would have encouraged nodes on the network to agree on a speed
  collectively, but the logic deviated from AIMD in undocumented ways,
  for example by making the incremental step multiplicative. It is
  unclear if this would actually cause any agreement on the network.
- All code was completely undocumented, had many seemingly arbitrarily
  chosen constants, and multiple lines of code with no effect at all.
- There are other ways to design the estimation of an ideal request
  starting speed that avoids most of the above problems, but it would
  still require selecting some arbitrary constants, so not obviously
  better than replacing all logic altogether with a single constant.

The whole thing can be viewed as a single network constant; the number of
requests per second and peer we can start to cause an ideal load on the
network, assuming distribution of types of requests and idling and busy
nodes looks like it does today. The biggest advantage of this method is
that it causes a very even starting of requests everywhere in the network,
with no oscillating speeding that chokes parts of the space in turns. This
may enable faster speeds with fewer rejected-overloads and peer backoffs.
There are other advantages with this simple method as well. If a future
release does something that improves or worsen rejected-overload ratio or
average request completion time, it will show clearly in the stats. The
network will not try to conceal the change.

The constant was tuned to an empirical value matching todays average
request starting speed. This may need finetuning in future releases if
rejected-overload situation improves and higher speeds are possible.

Made all stats average over whole session, but no persistent. This makes
them more useful to judge state of network.
diff --git a/src/freenet/clients/http/StatisticsToadlet.java b/src/freenet/clients/http/StatisticsToadlet.java
@@ -544,17 +544,11 @@ private void drawLoadBalancingBox(HTMLNode loadStatsInfobox, boolean realTime) {
 		loadStatsInfobox.addChild("div", "class", "infobox-header", "Load limiting "+(realTime ? "RealTime" : "Bulk"));
 		HTMLNode loadStatsContent = loadStatsInfobox.addChild("div", "class", "infobox-content");
 		RequestStarterGroup starters = core.requestStarters;
-		double window = starters.getWindow(realTime);
-		double realWindow = starters.getRealWindow(realTime);
 		HTMLNode loadStatsList = loadStatsContent.addChild("ul");
-		loadStatsList.addChild("li", l10n("globalWindow")+": "+window);
-		loadStatsList.addChild("li", l10n("realGlobalWindow")+": "+realWindow);
 		loadStatsList.addChild("li", starters.statsPageLine(false, false, realTime));
 		loadStatsList.addChild("li", starters.statsPageLine(true, false, realTime));
 		loadStatsList.addChild("li", starters.statsPageLine(false, true, realTime));
 		loadStatsList.addChild("li", starters.statsPageLine(true, true, realTime));
-		loadStatsList.addChild("li", starters.diagnosticThrottlesLine(false));
-		loadStatsList.addChild("li", starters.diagnosticThrottlesLine(true));
 	}
 	
 	private void drawNewLoadManagementBox(HTMLNode infobox) {
diff --git a/src/freenet/l10n/freenet.l10n.de.properties b/src/freenet/l10n/freenet.l10n.de.properties
@@ -1757,7 +1757,6 @@ StatisticsToadlet.distanceStats=Entfernungsstatistiken
 StatisticsToadlet.falsePos=Falsch positive
 StatisticsToadlet.fullTitle=Statistiken
 StatisticsToadlet.getLogs=Letzte Log-Datei des Knotens abrufen
-StatisticsToadlet.globalWindow=Globales Fenster
 StatisticsToadlet.inputRate=Eingehend: ${rate}/sec (von ${max}/sec)
 StatisticsToadlet.jobType=Job Typ
 StatisticsToadlet.jvmInfoTitle=Java-Info
diff --git a/src/freenet/l10n/freenet.l10n.en.properties b/src/freenet/l10n/freenet.l10n.en.properties
@@ -1985,7 +1985,6 @@ StatisticsToadlet.foafBytes=FOAF related: ${total}
 StatisticsToadlet.fullTitle=Statistics
 StatisticsToadlet.furthestSuccess=Furthest Success
 StatisticsToadlet.getLogs=Get latest node's logfile
-StatisticsToadlet.globalWindow=Global window
 StatisticsToadlet.inputRate=Input Rate: ${rate}/s (of ${max}/s)
 StatisticsToadlet.insertOutput=Insert output (excluding payload): CHK ${chk} SSK ${ssk}.
 StatisticsToadlet.jobType=Job Type
@@ -2017,7 +2016,6 @@ StatisticsToadlet.priority=Priority
 StatisticsToadlet.PUB_KEY=Pubkey
 StatisticsToadlet.queuedCount=Queued Count
 StatisticsToadlet.readRequests=Read-Requests
-StatisticsToadlet.realGlobalWindow=Real global window
 StatisticsToadlet.requestOutput=Request output (excluding payload): CHK ${chk} SSK ${ssk}.
 StatisticsToadlet.resendBytes=Resent bytes: ${total} (${percent}%)
 StatisticsToadlet.routingBackoffReason=Routing Backoff Reason
diff --git a/src/freenet/l10n/freenet.l10n.es.properties b/src/freenet/l10n/freenet.l10n.es.properties
@@ -1896,7 +1896,6 @@ StatisticsToadlet.foafBytes=De amigo de un amigo (FOAF): ${total}
 StatisticsToadlet.fullTitle=Estadísticas
 StatisticsToadlet.furthestSuccess=Éxito más lejano
 StatisticsToadlet.getLogs=Ver último fichero de registro (log)
-StatisticsToadlet.globalWindow=Ventana global
 StatisticsToadlet.inputRate=Tasa de entrada: ${rate}/s (de ${max}/s)
 StatisticsToadlet.insertOutput=Salida de inserciones (excluyendo carga útil): CHK ${chk} SSK ${ssk}.
 StatisticsToadlet.jobType=Tipo de trabajo
@@ -1928,7 +1927,6 @@ StatisticsToadlet.priority=Prioridad
 StatisticsToadlet.PUB_KEY=Clave pública
 StatisticsToadlet.queuedCount=En cola
 StatisticsToadlet.readRequests=Peticiones de lectura
-StatisticsToadlet.realGlobalWindow=Ventana global real
 StatisticsToadlet.requestOutput=Salida de peticiones (excluyendo carga útil): CHK ${chk} SSK ${ssk}.
 StatisticsToadlet.resendBytes=Bytes reenviados: ${total} (${percent}%)
 StatisticsToadlet.routingBackoffReason=Motivo de desasistencia de enrutamiento
diff --git a/src/freenet/l10n/freenet.l10n.fa.properties b/src/freenet/l10n/freenet.l10n.fa.properties
@@ -803,7 +803,6 @@ StatisticsToadlet.clientRequesters.priorityClass=کلاس اولویت
 StatisticsToadlet.clientRequesters.uri=آدرس اینترنتی
 StatisticsToadlet.datasize=اندازه داده
 StatisticsToadlet.fullTitle=آمار
-StatisticsToadlet.globalWindow=پنجره سراسری
 StatisticsToadlet.jvmInfoTitle=نوع جاوا
 StatisticsToadlet.keys=کلید ها
 StatisticsToadlet.maxTotalPeers=همتایان بیشینه
diff --git a/src/freenet/l10n/freenet.l10n.fr.properties b/src/freenet/l10n/freenet.l10n.fr.properties
@@ -1896,7 +1896,6 @@ StatisticsToadlet.foafBytes=Connexe aux amis d’un ami : ${total}
 StatisticsToadlet.fullTitle=Statistiques
 StatisticsToadlet.furthestSuccess=Succès le plus éloigné
 StatisticsToadlet.getLogs=Obtenir le dernier journal du nœud
-StatisticsToadlet.globalWindow=Fenêtre globale
 StatisticsToadlet.inputRate=Taux d’entrée : ${rate}/s (sur ${max}/s)
 StatisticsToadlet.insertOutput=Sortie d’insertion (excluant la charge utile) : CHK ${chk} SSK ${ssk}.
 StatisticsToadlet.jobType=Type de travail
@@ -1928,7 +1927,6 @@ StatisticsToadlet.priority=Priorité
 StatisticsToadlet.PUB_KEY=Clé publique
 StatisticsToadlet.queuedCount=Compteur de la file d’attente
 StatisticsToadlet.readRequests=Requêtes de lecture
-StatisticsToadlet.realGlobalWindow=Fenêtre globale réelle
 StatisticsToadlet.requestOutput=Sortie des requêtes (excluant la charge utile) : CHK ${chk} SSK ${ssk}.
 StatisticsToadlet.resendBytes=Octets renvoyés : ${total} (${percent} %)
 StatisticsToadlet.routingBackoffReason=Raison de la temporisation (backoff) du routage
diff --git a/src/freenet/l10n/freenet.l10n.it.properties b/src/freenet/l10n/freenet.l10n.it.properties
@@ -1741,7 +1741,6 @@ StatisticsToadlet.falsePos=Falsi positivi
 StatisticsToadlet.fullTitle=Statistiche
 StatisticsToadlet.furthestSuccess=Successo più lontano
 StatisticsToadlet.getLogs=Prendi l'ultimo file di registro del nodo
-StatisticsToadlet.globalWindow=Finestra globale
 StatisticsToadlet.inputRate=Tasso di input: ${rate}/s (di ${max}/s)
 StatisticsToadlet.insertOutput=Output degli inserimenti (escludendo il carico utile): CHK ${chk} SSK ${ssk}
 StatisticsToadlet.jobType=Tipo di lavoro
@@ -1770,7 +1769,6 @@ StatisticsToadlet.priority=Priorità
 StatisticsToadlet.PUB_KEY=Pubkey (chiave pubblica)
 StatisticsToadlet.queuedCount=Conteggio accodato
 StatisticsToadlet.readRequests=Richieste di lettura
-StatisticsToadlet.realGlobalWindow=Finestra reale globale
 StatisticsToadlet.requestOutput=Output delle richieste (carico utile escluso): CHK ${chk} SSK ${ssk}.
 StatisticsToadlet.resendBytes=Bytes rispediti: ${total} (${percent}%)
 StatisticsToadlet.routingBackoffReason=Motivo del recesso dell'instradamento
diff --git a/src/freenet/l10n/freenet.l10n.ja.properties b/src/freenet/l10n/freenet.l10n.ja.properties
@@ -1200,7 +1200,6 @@ StatisticsToadlet.foafBytes=友達の友達関係: ${total}
 StatisticsToadlet.fullTitle=統計
 StatisticsToadlet.furthestSuccess=もっとも遠い成功
 StatisticsToadlet.getLogs=ノードの最新のログファイルを入手
-StatisticsToadlet.globalWindow=グローバルウィンドウ
 StatisticsToadlet.inputRate=入力レート: ${rate}/s (of ${max}/s)
 StatisticsToadlet.insertOutput=インサート出力 (ペイロードを含まず): CHK ${chk} SSK ${ssk}.
 StatisticsToadlet.jobType=ジョブタイプ
diff --git a/src/freenet/l10n/freenet.l10n.nb-no.properties b/src/freenet/l10n/freenet.l10n.nb-no.properties
@@ -1465,7 +1465,6 @@ StatisticsToadlet.datastore=Datalager
 StatisticsToadlet.databaseJobsByPriority=Database-jobber
 StatisticsToadlet.distanceStats=Distansestatistikk
 StatisticsToadlet.fullTitle=Statistikk
-StatisticsToadlet.globalWindow=Hovedvindu
 StatisticsToadlet.jobType=Jobb-type
 StatisticsToadlet.jvmInfoTitle=JVM-info
 StatisticsToadlet.jvmName=Java VM-navn: ${name}
diff --git a/src/freenet/l10n/freenet.l10n.nl.properties b/src/freenet/l10n/freenet.l10n.nl.properties
@@ -1838,7 +1838,6 @@ StatisticsToadlet.foafBytes=FOAF gerelateerd: ${total}
 StatisticsToadlet.fullTitle=Statistieken
 StatisticsToadlet.furthestSuccess=Verste succes
 StatisticsToadlet.getLogs=Haal het meest recente logbestand op
-StatisticsToadlet.globalWindow=Globale venster
 StatisticsToadlet.inputRate=Huidig inkomend verbruik: ${rate}/s (max ${max}/s)
 StatisticsToadlet.insertOutput=Uitgaand invoegingenverkeer (exclusief payload): CHK ${chk} SSK ${ssk}.
 StatisticsToadlet.jobType=Taak type
@@ -1868,7 +1867,6 @@ StatisticsToadlet.peerStatsTitle=Peer-statistieken
 StatisticsToadlet.priority=Prioriteit
 StatisticsToadlet.queuedCount=Aantal queued
 StatisticsToadlet.readRequests=Leesverzoeken
-StatisticsToadlet.realGlobalWindow=Ware globale venster
 StatisticsToadlet.requestOutput=Uitgaande verzoeken (exclusief payload): CHK ${chk} SSK ${ssk}.
 StatisticsToadlet.resendBytes=Opnieuw verstuurde bytes: ${total}
 StatisticsToadlet.routingBackoffReason=Routering terugtreedreden
diff --git a/src/freenet/l10n/freenet.l10n.pt-br.properties b/src/freenet/l10n/freenet.l10n.pt-br.properties
@@ -1739,7 +1739,6 @@ StatisticsToadlet.foafBytes=Relacionado a amigos de amigos: ${total}
 StatisticsToadlet.fullTitle=Estatísticas
 StatisticsToadlet.furthestSuccess=Sucesso mais distante
 StatisticsToadlet.getLogs=Obter o último arquivo de registros do nó
-StatisticsToadlet.globalWindow=Janela global
 StatisticsToadlet.inputRate=Taxa de entrada: ${rate}/s (de ${max}/s)
 StatisticsToadlet.jobType=Tipo de tarefa
 StatisticsToadlet.jvmInfoTitle=Informações da Máquina Virtual Java
@@ -1765,7 +1764,6 @@ StatisticsToadlet.peerStatsTitle=Estatísticas de nós
 StatisticsToadlet.priority=Prioridade
 StatisticsToadlet.PUB_KEY=Chavepub
 StatisticsToadlet.readRequests=Pedidos de leitura
-StatisticsToadlet.realGlobalWindow=Janela global real
 StatisticsToadlet.resendBytes=Bytes reenviados: ${total} (${percent}%)
 StatisticsToadlet.routingDisabled=Sem tráfego de roteamento (estamos conectados ao nó, mas há recusa, dele ou nossa, em encaminhar tráfego)
 StatisticsToadlet.routingDisabledShort=Sem rotear tráfego
diff --git a/src/freenet/l10n/freenet.l10n.pt_PT.properties b/src/freenet/l10n/freenet.l10n.pt_PT.properties
@@ -663,7 +663,6 @@ StatisticsToadlet.clientRequesters.priorityClass=Classe da Prioridade
 StatisticsToadlet.clientRequesters.uri=URL
 StatisticsToadlet.datasize=Tamanho dos Dados
 StatisticsToadlet.fullTitle=Estatísticas
-StatisticsToadlet.globalWindow=Janela global
 StatisticsToadlet.jobType=Tipo de Trabalho
 StatisticsToadlet.jvmInfoTitle=Informação Java
 StatisticsToadlet.keys=Chaves
@@ -672,7 +671,6 @@ StatisticsToadlet.osName=Nome do SO: ${name}
 StatisticsToadlet.osVersion=Versão do SO: ${version}
 StatisticsToadlet.priority=Prioridade
 StatisticsToadlet.PUB_KEY=Chave pública
-StatisticsToadlet.realGlobalWindow=Janela global real
 StatisticsToadlet.running=Em execução
 StatisticsToadlet.seedTableConnections=Ligado
 StatisticsToadlet.seedTableAnnouncements=Anunciado
diff --git a/src/freenet/l10n/freenet.l10n.ru.properties b/src/freenet/l10n/freenet.l10n.ru.properties
@@ -1634,7 +1634,6 @@ StatisticsToadlet.foafBytes=Обмен FOAF: ${total}
 StatisticsToadlet.fullTitle=Статистика
 StatisticsToadlet.furthestSuccess=Самое дальнее попадание
 StatisticsToadlet.getLogs=Получить последний лог-файл узла
-StatisticsToadlet.globalWindow=«Глобальное окно» программы
 StatisticsToadlet.inputRate=Скорость загрузки: ${rate}/с (из ${max}/с)
 StatisticsToadlet.insertOutput=Исх. трафик выгрузок (только служ. информация): CHK ${chk} SSK ${ssk}.
 StatisticsToadlet.jobType=Тип работ
@@ -1665,7 +1664,6 @@ StatisticsToadlet.peerStatsTitle=Соседние узлы
 StatisticsToadlet.priority=Приоритет
 StatisticsToadlet.queuedCount=В очереди
 StatisticsToadlet.readRequests=Запросы на чтение
-StatisticsToadlet.realGlobalWindow=Действительное «глобальное окно» программы
 StatisticsToadlet.requestOutput=Исх. трафик ответов (только служ. информация): CHK ${chk} SSK ${ssk}.
 StatisticsToadlet.resendBytes=Отправлено повторно: ${total} (${percent}%)
 StatisticsToadlet.routingBackoffReason=Причины отказа в перенаправлении
diff --git a/src/freenet/l10n/freenet.l10n.zh-cn.properties b/src/freenet/l10n/freenet.l10n.zh-cn.properties
@@ -1906,7 +1906,6 @@ StatisticsToadlet.foafBytes=FOAF 相关: ${total}
 StatisticsToadlet.fullTitle=统计数据
 StatisticsToadlet.furthestSuccess=最远成功距离
 StatisticsToadlet.getLogs=获取最近的节点日志
-StatisticsToadlet.globalWindow=全局窗口
 StatisticsToadlet.inputRate=输入速率: ${rate}/秒 (上限 ${max}/秒)
 StatisticsToadlet.insertOutput=插入输出 (排除有效载荷): CHK ${chk} SSK ${ssk}
 StatisticsToadlet.jobType=工作类型
@@ -1938,7 +1937,6 @@ StatisticsToadlet.priority=优先级
 StatisticsToadlet.PUB_KEY=公钥
 StatisticsToadlet.queuedCount=队列计数
 StatisticsToadlet.readRequests=读取请求
-StatisticsToadlet.realGlobalWindow=实时全局窗口
 StatisticsToadlet.requestOutput=请求输出 (排除有效载荷): CHK ${chk} SSK ${ssk}
 StatisticsToadlet.resendBytes=重新发送字节: ${total}
 StatisticsToadlet.routingBackoffReason=路由退避原因
diff --git a/src/freenet/l10n/freenet.l10n.zh-tw.properties b/src/freenet/l10n/freenet.l10n.zh-tw.properties
@@ -1884,7 +1884,6 @@ StatisticsToadlet.foafBytes=FOAF 相關: ${total}
 StatisticsToadlet.fullTitle=統計資料
 StatisticsToadlet.furthestSuccess=最遠成功距離
 StatisticsToadlet.getLogs=下載節點的最新日誌
-StatisticsToadlet.globalWindow=全域視窗
 StatisticsToadlet.inputRate=輸入速率: 每秒 ${rate} (上限每秒 ${max})
 StatisticsToadlet.insertOutput=入鍵輸出(不包含載物): CHK ${chk} SSK ${ssk}.
 StatisticsToadlet.jobType=工作類型
@@ -1916,7 +1915,6 @@ StatisticsToadlet.priority=優先度
 StatisticsToadlet.PUB_KEY=公鑰
 StatisticsToadlet.queuedCount=佇列計數
 StatisticsToadlet.readRequests=讀取請求
-StatisticsToadlet.realGlobalWindow=實時全域視窗
 StatisticsToadlet.requestOutput=請求輸出(不包含載物): CHK ${chk} SSK ${ssk}.
 StatisticsToadlet.resendBytes=重送位元組: ${total}
 StatisticsToadlet.routingBackoffReason=路由退避原因
diff --git a/src/freenet/node/BaseRequestThrottle.java b/src/freenet/node/BaseRequestThrottle.java
diff --git a/src/freenet/node/NodeClientCore.java b/src/freenet/node/NodeClientCore.java
@@ -1210,7 +1210,7 @@ public void onRequestSenderFinished(int status, boolean fromOfferedKey, RequestS
 						if(!rejectedOverload)
 							requestStarters.requestCompleted(isSSK, false, key, realTimeFlag);
 						// Count towards RTT even if got a RejectedOverload - but not if timed out.
-						requestStarters.getThrottle(isSSK, false, realTimeFlag).successfulCompletion(rtt);
+						requestStarters.getStats(isSSK, false, realTimeFlag).addRTT(rtt);
 						if(isSSK) {
 							node.nodeStats.reportSSKOutcome(rtt, status == RequestSender.SUCCESS, realTimeFlag);
 						} else {
@@ -1421,7 +1421,7 @@ ClientCHKBlock realGetCHK(ClientCHK key, boolean localOnly, boolean ignoreStore,
 						if(!rejectedOverload)
 							requestStarters.requestCompleted(false, false, key.getNodeKey(true), realTimeFlag);
 						// Count towards RTT even if got a RejectedOverload - but not if timed out.
-						requestStarters.getThrottle(false, false, realTimeFlag).successfulCompletion(rtt);
+						requestStarters.getStats(false, false, realTimeFlag).addRTT(rtt);
 						node.nodeStats.reportCHKOutcome(rtt, status == RequestSender.SUCCESS, targetLocation, realTimeFlag);
 						if(status == RequestSender.SUCCESS) {
 							Logger.minor(this, "Successful CHK fetch took "+rtt);
@@ -1542,7 +1542,7 @@ ClientSSKBlock realGetSSK(ClientSSK key, boolean localOnly, boolean ignoreStore,
 						if(!rejectedOverload)
 							requestStarters.requestCompleted(true, false, key.getNodeKey(true), realTimeFlag);
 						// Count towards RTT even if got a RejectedOverload - but not if timed out.
-						requestStarters.getThrottle(true, false, realTimeFlag).successfulCompletion(rtt);
+						requestStarters.getStats(true, false, realTimeFlag).addRTT(rtt);
 						node.nodeStats.reportSSKOutcome(rtt, status == RequestSender.SUCCESS, realTimeFlag);
 					}
 
@@ -1667,7 +1667,7 @@ public void realPutCHK(CHKBlock block, boolean canWriteClientCache, boolean fork
 					long len = endTime - startTime;
 
 					// RejectedOverload requests count towards RTT (timed out ones don't).
-					requestStarters.getThrottle(false, true, realTimeFlag).successfulCompletion(len);
+					requestStarters.getStats(false, true, realTimeFlag).addRTT(len);
 					requestStarters.requestCompleted(false, true, block.getKey(), realTimeFlag);
 				}
 
@@ -1786,7 +1786,7 @@ public void realPutSSK(SSKBlock block, boolean canWriteClientCache, boolean fork
 					long endTime = System.currentTimeMillis();
 					long rtt = endTime - startTime;
 					requestStarters.requestCompleted(true, true, block.getKey(), realTimeFlag);
-					requestStarters.getThrottle(true, true, realTimeFlag).successfulCompletion(rtt);
+					requestStarters.getStats(true, true, realTimeFlag).addRTT(rtt);
 				}
 
 			int status = is.getStatus();
diff --git a/src/freenet/node/RequestStarter.java b/src/freenet/node/RequestStarter.java
@@ -61,7 +61,6 @@ public static boolean isValidPriorityClass(int prio) {
 		return !((prio < MAXIMUM_PRIORITY_CLASS) || (prio > PAUSED_PRIORITY_CLASS));
 	}
 	
-	final BaseRequestThrottle throttle;
 	final RunningAverage averageInputBytesPerRequest;
 	final RunningAverage averageOutputBytesPerRequest;
 	RequestScheduler sched;
@@ -72,12 +71,16 @@ public static boolean isValidPriorityClass(int prio) {
 	final boolean realTime;
 	
 	static final int MAX_WAITING_FOR_SLOTS = 50;
-	
-	public RequestStarter(NodeClientCore node, BaseRequestThrottle throttle, String name, 
-			RunningAverage averageOutputBytesPerRequest, RunningAverage averageInputBytesPerRequest, boolean isInsert, boolean isSSK, boolean realTime) {
+
+	/** Throttle speed at which local requests are started */
+	private final long DELAY_MS_PER_PEER = 5400; // 655 MB/hour if 30 peers
+
+	public RequestStarter(NodeClientCore node, String name,
+			RunningAverage averageOutputBytesPerRequest,
+			RunningAverage averageInputBytesPerRequest,
+			boolean isInsert, boolean isSSK, boolean realTime) {
 		this.core = node;
 		this.stats = core.nodeStats;
-		this.throttle = throttle;
 		this.name = name + (realTime ? " (realtime)" : " (bulk)");
 		this.averageOutputBytesPerRequest = averageOutputBytesPerRequest;
 		this.averageInputBytesPerRequest = averageInputBytesPerRequest;
@@ -127,9 +130,10 @@ void realRun() {
 				if(logMINOR) Logger.minor(this, "Running "+req+" priority "+req.getPriority());
 				if(!req.localRequestOnly) {
 					// Wait
-					long delay;
-					delay = throttle.getDelay();
-					if(logMINOR) Logger.minor(this, "Delay="+delay+" from "+throttle);
+					long numPeers = core.node.peers.countNonBackedOffPeers(realTime);
+					if (numPeers < 1) numPeers = 1;
+					long delay = DELAY_MS_PER_PEER / numPeers;
+					if(logMINOR) Logger.minor(this, "Delay="+delay);
 					long sleepUntil = cycleTime + delay;
 					long now;
 					do {
diff --git a/src/freenet/node/RequestStarterGroup.java b/src/freenet/node/RequestStarterGroup.java
diff --git a/src/freenet/node/ThrottleWindowManager.java b/src/freenet/node/ThrottleWindowManager.java
