[tor-commits] [onionperf/master] Reduce timeout and stallout values.

[karsten at torproject.org]

commit 3e79f084dfa918e06695a12106672740478a4c79
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Fri May 22 12:14:52 2020 +0200

    Reduce timeout and stallout values.
    
    The idea is to avoid overlapping measurements. With a new measurement
    starting every 5:00 minutes, we time out after 4:30 minutes to make
    "room" for the next measurement to start.
    
    We also don't use the stallout feature anymore by setting the value to
    0 seconds. The stallout would have failed a measurement after not
    receiving new bytes for the given number of seconds. But that's also
    not what we want to measure.
    
    Implements #34024.
---
 onionperf/model.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/onionperf/model.py b/onionperf/model.py
index a5e0787..03e7084 100644
--- a/onionperf/model.py
+++ b/onionperf/model.py
@@ -73,9 +73,9 @@ class TorperfModel(GeneratableTGenModel):
         if self.socksproxy is not None:
             g.node["start"]["socksproxy"] = self.socksproxy
         g.add_node("pause", time="5 minutes")
-        g.add_node("transfer50k", type="get", protocol="tcp", size="50 KiB", timeout="295 seconds", stallout="300 seconds")
-        g.add_node("transfer1m", type="get", protocol="tcp", size="1 MiB", timeout="1795 seconds", stallout="1800 seconds")
-        g.add_node("transfer5m", type="get", protocol="tcp", size="5 MiB", timeout="3595 seconds", stallout="3600 seconds")
+        g.add_node("transfer50k", type="get", protocol="tcp", size="50 KiB", timeout="270 seconds", stallout="0 seconds")
+        g.add_node("transfer1m", type="get", protocol="tcp", size="1 MiB", timeout="270 seconds", stallout="0 seconds")
+        g.add_node("transfer5m", type="get", protocol="tcp", size="5 MiB", timeout="270 seconds", stallout="0 seconds")
 
         g.add_edge("start", "pause")