Bug 1500523 - Increase DMD timeout. r=njn
authorEric Rahm <erahm@mozilla.com>
Mon, 22 Oct 2018 14:05:47 -0700
changeset 443240 12a3e5907c80124250e8077f8a857ffe8349ff46
parent 443239 859c3fd87f9371916f7f0e03ddb2260f21c6585b
child 443241 c8dd89a8738570dfb66cbd8627a299c63583a6cb
push id34945
push userncsoregi@mozilla.com
push dateSat, 27 Oct 2018 09:51:30 +0000
treeherdermozilla-central@7007206a3cd4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnjn
bugs1500523
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1500523 - Increase DMD timeout. r=njn This bumps the timeout when waiting for reports to 180 seconds which seems to be long enough for MacOS in automation.
testing/awsy/awsy/awsy_test_case.py
xpcom/base/nsMemoryReporterManager.h
--- a/testing/awsy/awsy/awsy_test_case.py
+++ b/testing/awsy/awsy/awsy_test_case.py
@@ -250,17 +250,17 @@ class AwsyTestCase(MarionetteTestCase):
             """ % ident
 
         try:
             # This is async and there's no callback so we use the existence
             # of an incomplete memory report to check if it hasn't finished yet.
             self.marionette.execute_script(dmd_script, script_timeout=60000)
             tmpdir = tempfile.gettempdir()
             prefix = "incomplete-unified-memory-report-%s-%d-*" % (checkpointName, iteration)
-            max_wait = 60
+            max_wait = 240
             elapsed = 0
             while fnmatch.filter(os.listdir(tmpdir), prefix) and elapsed < max_wait:
                 self.logger.info("Waiting for memory report to finish")
                 time.sleep(1)
                 elapsed += 1
 
             incomplete = fnmatch.filter(os.listdir(tmpdir), prefix)
             if incomplete:
--- a/xpcom/base/nsMemoryReporterManager.h
+++ b/xpcom/base/nsMemoryReporterManager.h
@@ -201,17 +201,17 @@ private:
   void DispatchReporter(nsIMemoryReporter* aReporter, bool aIsAsync,
                         nsIHandleReportCallback* aHandleReport,
                         nsISupports* aHandleReportData,
                         bool aAnonymize);
 
   static void TimeoutCallback(nsITimer* aTimer, void* aData);
   // Note: this timeout needs to be long enough to allow for the
   // possibility of DMD reports and/or running on a low-end phone.
-  static const uint32_t kTimeoutLengthMS = 50000;
+  static const uint32_t kTimeoutLengthMS = 180000;
 
   mozilla::Mutex mMutex;
   bool mIsRegistrationBlocked;
 
   StrongReportersTable* mStrongReporters;
   WeakReportersTable* mWeakReporters;
 
   // These two are only used for testing purposes.