From 3f05c21f55aabaa347566aee7c0e091b36d26c9a Mon Sep 17 00:00:00 2001
From: ncteisen <ncteisen@gmail.com>
Date: Thu, 1 Jun 2017 12:43:58 -0700
Subject: [PATCH] Add timeout and retries to fix flakes
---
tools/profiling/microbenchmarks/bm_diff/bm_diff.py | 2 +-
tools/profiling/microbenchmarks/bm_diff/bm_run.py | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/profiling/microbenchmarks/bm_diff/bm_diff.py b/tools/profiling/microbenchmarks/bm_diff/bm_diff.py
index 796ddac714..c389d03adb 100755
--- a/tools/profiling/microbenchmarks/bm_diff/bm_diff.py
+++ b/tools/profiling/microbenchmarks/bm_diff/bm_diff.py
@@ -129,9 +129,9 @@ class Benchmark:
def row(self, flds):
return [self.final[f] if f in self.final else '' for f in flds]
-
def _read_json(filename):
try:
+
with open(filename) as f:
return json.loads(f.read())
except ValueError, e:
diff --git a/tools/profiling/microbenchmarks/bm_diff/bm_run.py b/tools/profiling/microbenchmarks/bm_diff/bm_run.py
index 9873df0412..5942929985 100755
--- a/tools/profiling/microbenchmarks/bm_diff/bm_run.py
+++ b/tools/profiling/microbenchmarks/bm_diff/bm_run.py
@@ -107,7 +107,8 @@ def _collect_bm_data(bm, cfg, name, reps, idx, loops):
shortname='%s %s %s %s %d/%d' % (bm, line, cfg, name, idx + 1,
loops),
verbose_success=True,
- timeout_seconds=None))
+ timeout_seconds=60*10,
+ timeout_retries=3))
return jobs_list
--
GitLab