Revert "[Perf waterfall] Set io_timeout to 4 hours."

This reverts commit 4decd028.

Reason for revert: broke tests.

Original change's description:
> [Perf waterfall] Set io_timeout to 4 hours.
> 
> TBR=simonhatch@chromium.org
> 
> Bug: 969819
> Change-Id: I772891cbfacaae9c6d0c233e2934e54826bec69c
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1639576
> Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
> Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
> Auto-Submit: Caleb Rouleau <crouleau@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#665701}

TBR=simonhatch@chromium.org,crouleau@chromium.org,jbudorick@chromium.org,hypan@google.com

Change-Id: If6163597a4cc2ddf366692109328a6273fdbe98a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 969819
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1642152Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#665718}

testing/buildbot/chromium.perf.fyi.json

@@ -33,7 +33,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 3
         },
         "trigger_script": {
@@ -77,7 +77,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400
+          "io_timeout": 1800
         },
         "trigger_script": {
           "args": [

testing/buildbot/chromium.perf.json

@@ -30,7 +30,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -69,7 +69,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -108,7 +108,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -151,7 +151,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 16
         },
         "trigger_script": {
@@ -198,7 +198,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 16
         },
         "trigger_script": {
@@ -245,7 +245,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 12
         },
         "trigger_script": {
@@ -286,7 +286,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -323,7 +323,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -360,7 +360,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -399,7 +399,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -438,7 +438,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -479,7 +479,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 5
         },
         "trigger_script": {
@@ -520,7 +520,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -557,7 +557,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -594,7 +594,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -634,7 +634,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 5
         },
         "trigger_script": {
@@ -676,7 +676,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400
+          "io_timeout": 1800
         }
       },
       {
@@ -700,7 +700,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400
+          "io_timeout": 1800
         }
       },
       {
@@ -724,7 +724,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400
+          "io_timeout": 1800
         }
       },
       {
@@ -748,7 +748,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400
+          "io_timeout": 1800
         }
       }
     ]
@@ -785,7 +785,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 19
         },
         "trigger_script": {
@@ -831,7 +831,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 25
         },
         "trigger_script": {
@@ -875,7 +875,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -914,7 +914,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -953,7 +953,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -992,7 +992,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1031,7 +1031,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1070,7 +1070,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1113,7 +1113,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 16
         },
         "trigger_script": {
@@ -1159,7 +1159,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 35
         },
         "trigger_script": {
@@ -1205,7 +1205,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 28
         },
         "trigger_script": {
@@ -1247,7 +1247,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400
+          "io_timeout": 1800
         }
       },
       {
@@ -1271,7 +1271,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400
+          "io_timeout": 1800
         }
       },
       {
@@ -1295,7 +1295,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400
+          "io_timeout": 1800
         }
       },
       {
@@ -1319,7 +1319,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400
+          "io_timeout": 1800
         }
       }
     ]
@@ -1356,7 +1356,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1393,7 +1393,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1430,7 +1430,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1467,7 +1467,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1504,7 +1504,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1541,7 +1541,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1582,7 +1582,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 26
         },
         "trigger_script": {
@@ -1623,7 +1623,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1660,7 +1660,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1701,7 +1701,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 26
         },
         "trigger_script": {
@@ -1742,7 +1742,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1779,7 +1779,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1816,7 +1816,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1853,7 +1853,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1890,7 +1890,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -1931,7 +1931,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 26
         },
         "trigger_script": {
@@ -1978,7 +1978,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -2015,7 +2015,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -2052,7 +2052,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -2089,7 +2089,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -2126,7 +2126,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 1
         },
         "trigger_script": {
@@ -2167,7 +2167,7 @@
           "expiration": 7200,
           "hard_timeout": 36000,
           "ignore_task_failure": false,
-          "io_timeout": 14400,
+          "io_timeout": 1800,
           "shards": 26
         },
         "trigger_script": {

tools/perf/core/perf_data_generator.py

@@ -1084,11 +1084,7 @@ def generate_performance_test(tester_config, test):
     # to ~2 hrs.
     'hard_timeout': 10 * 60 * 60, # 10 hours timeout for full suite
     'ignore_task_failure': False,
-    # 4 hour timeout. Note that this is effectively the timeout for a
-    # benchmarking subprocess to run since we intentionally do not stream
-    # subprocess output to the task stdout.
-    # TODO(crbug.com/865538): Reduce this once we can reduce hard_timeout.
-    'io_timeout': 4 * 60 * 60,
+    'io_timeout': 30 * 60, # 30 minutes
     'dimension_sets': [
       tester_config['dimension']
     ],