From 49a529842a52360abccfd110804b0655f4dbde65 Mon Sep 17 00:00:00 2001 From: Christian Holler Date: Thu, 5 Mar 2020 14:01:35 +0000 Subject: [PATCH] Bug 1614294 - Increase the shutdown crash timeout for TSan builds. r=froydnj Differential Revision: https://phabricator.services.mozilla.com/D65497 --HG-- extra : moz-landing-system : lando --- modules/libpref/init/all.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js index f01d0410fb63..bae328c15e1e 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -812,7 +812,11 @@ pref("toolkit.telemetry.unified", true); #else // ASan and TSan builds can be considerably slower. Extend the grace period // of both asyncshutdown and the terminator. - pref("toolkit.asyncshutdown.crash_timeout", 180000); // 3 minutes + #if defined(MOZ_TSAN) + pref("toolkit.asyncshutdown.crash_timeout", 360000); // 6 minutes + #else + pref("toolkit.asyncshutdown.crash_timeout", 180000); // 3 minutes + #endif #endif // !defined(MOZ_ASAN) && !defined(MOZ_TSAN) // Extra logging for AsyncShutdown barriers and phases pref("toolkit.asyncshutdown.log", false);