From 674b1f6f525f750146ce04fb9ef0f61263d455ce Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Fri, 15 Nov 2019 09:08:09 -0500
Subject: [PATCH] use more reasonable timeouts for sanitizer tests

---
 test/cpp/end2end/BUILD                |  1 +
 tools/remote_build/rbe_common.bazelrc | 19 +++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/test/cpp/end2end/BUILD b/test/cpp/end2end/BUILD
index 450ce3416cc..55c594c7f15 100644
--- a/test/cpp/end2end/BUILD
+++ b/test/cpp/end2end/BUILD
@@ -724,6 +724,7 @@ grpc_cc_test(
         "//test/core/util:grpc_test_util",
         "//test/cpp/util:test_util",
     ],
+    shard_count = 5,
 )
 
 grpc_cc_test(
diff --git a/tools/remote_build/rbe_common.bazelrc b/tools/remote_build/rbe_common.bazelrc
index d1a1140f3af..af024760cd4 100644
--- a/tools/remote_build/rbe_common.bazelrc
+++ b/tools/remote_build/rbe_common.bazelrc
@@ -52,15 +52,16 @@ build --build_tag_filters=-no_linux
 # address sanitizer: most settings are already in %workspace%/.bazelrc
 # we only need a few additional ones that are Foundry specific
 build:asan --copt=-gmlt
-# TODO(jtattermusch): use more reasonable test timeout
-build:asan --test_timeout=3600
+# use double the default value for "moderate" and "long" timeout as sanitizer
+# tests tend to be slower
+build:asan --test_timeout=60,600,1800,3600
 build:asan --test_tag_filters=-no_linux,-qps_json_driver
 
 # memory sanitizer: most settings are already in %workspace%/.bazelrc
 # we only need a few additional ones that are Foundry specific
 build:msan --copt=-gmlt
-# TODO(jtattermusch): use more reasonable test timeout
-build:msan --test_timeout=3600
+# "moderate" timeout 3x the default, "long" timeout 2x the default
+build:msan --test_timeout=60,900,1800,3600
 # TODO(jtattermusch): revisit the disabled tests
 build:msan --test_tag_filters=-no_linux,-nomsan,-json_run_localhost
 build:msan --cxxopt=--stdlib=libc++
@@ -74,16 +75,18 @@ build:msan --crosstool_top=@rbe_msan//cc:toolchain
 # thread sanitizer: most settings are already in %workspace%/.bazelrc
 # we only need a few additional ones that are Foundry specific
 build:tsan --copt=-gmlt
-# TODO(jtattermusch): use more reasonable test timeout
-build:tsan --test_timeout=3600
+# use double the default value for "moderate" and "long" timeout as sanitizer
+# tests tend to be slower
+build:tsan --test_timeout=60,600,1800,3600
 build:tsan --test_tag_filters=-no_linux,-qps_json_driver
 build:tsan --extra_execution_platforms=@rbe_default//config:platform
 
 # undefined behavior sanitizer: most settings are already in %workspace%/.bazelrc
 # we only need a few additional ones that are Foundry specific
 build:ubsan --copt=-gmlt
-# TODO(jtattermusch): use more reasonable test timeout
-build:ubsan --test_timeout=3600
+# use double the default value for "moderate" and "long" timeout as sanitizer
+# tests tend to be slower
+build:ubsan --test_timeout=60,600,1800,3600
 # override the config-agnostic crosstool_top
 # how to update the bazel toolchain for ubsan:
 # - check for the latest released version in https://github.com/bazelbuild/bazel-toolchains/tree/master/configs/experimental/ubuntu16_04_clang