Repository: impala Updated Branches: refs/heads/master 15e8ce4f2 -> 1d72c7584
IMPALA-5031: Increase backend test timeout under UBSAN_FULL When codegen is run with ubsan, backend tests slow down dramatically. This patch increases the timeout to four hours in when UBSAN_FULL is the build type. This limit is approached by expr-test, which takes almost three hours under UBSAN_FULL. Change-Id: I3eee4c2b3affc9d65d86c043fcc382d7248adf3e Reviewed-on: http://gerrit.cloudera.org:8080/11764 Reviewed-by: Jim Apple <[email protected]> Tested-by: Impala Public Jenkins <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/impala/repo Commit: http://git-wip-us.apache.org/repos/asf/impala/commit/1d72c758 Tree: http://git-wip-us.apache.org/repos/asf/impala/tree/1d72c758 Diff: http://git-wip-us.apache.org/repos/asf/impala/diff/1d72c758 Branch: refs/heads/master Commit: 1d72c7584fd33746b17826c1dc54a1819fce9ec5 Parents: 15e8ce4 Author: Jim Apple <[email protected]> Authored: Tue Oct 23 20:23:35 2018 -0700 Committer: Impala Public Jenkins <[email protected]> Committed: Wed Oct 24 20:27:36 2018 +0000 ---------------------------------------------------------------------- be/CMakeLists.txt | 1 + be/src/common/init.cc | 4 ++++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/impala/blob/1d72c758/be/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/be/CMakeLists.txt b/be/CMakeLists.txt index adbaade..608998f 100644 --- a/be/CMakeLists.txt +++ b/be/CMakeLists.txt @@ -160,6 +160,7 @@ elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "UBSAN") SET(CMAKE_CXX_FLAGS "${CXX_FLAGS_UBSAN}") elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "UBSAN_FULL") SET(CMAKE_CXX_FLAGS "${CXX_FLAGS_UBSAN}") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DUNDEFINED_SANITIZER_FULL") elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "TSAN") SET(CMAKE_CXX_FLAGS "${CXX_FLAGS_TSAN}") else() http://git-wip-us.apache.org/repos/asf/impala/blob/1d72c758/be/src/common/init.cc ---------------------------------------------------------------------- diff --git a/be/src/common/init.cc b/be/src/common/init.cc index 6c02dbf..b064485 100644 --- a/be/src/common/init.cc +++ b/be/src/common/init.cc @@ -120,7 +120,11 @@ static unique_ptr<impala::Thread> be_timeout_thread; // Timeout after 2 hours - backend tests should generally run in minutes or tens of // minutes at worst. +#if defined(UNDEFINED_SANITIZER_FULL) +static const int64_t BE_TEST_TIMEOUT_S = 60L * 60L * 4L; +#else static const int64_t BE_TEST_TIMEOUT_S = 60L * 60L * 2L; +#endif [[noreturn]] static void LogMaintenanceThread() { while (true) {
