Add timeout and retries to fix flakes

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:

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