From a0295db30f39b776aa17d25a22b7ab629e9b7928 Mon Sep 17 00:00:00 2001 From: zepumph Date: Thu, 30 Jun 2022 13:57:08 -0600 Subject: [PATCH] add --no-zygote option, https://github.com/phetsims/aqua/issues/150 --- js/server/ContinuousServerClient.js | 4 ++-- js/server/puppeteerCTClient.js | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/js/server/ContinuousServerClient.js b/js/server/ContinuousServerClient.js index 48fb23f..16c4922 100644 --- a/js/server/ContinuousServerClient.js +++ b/js/server/ContinuousServerClient.js @@ -75,8 +75,8 @@ class ContinuousServerClient { this.newClientWorker( workers, count++ ); } - // Check back in every 30 seconds to see if we need to restart any workers. - await sleep( 30000 ); + // Check back in every 5 seconds to see if we need to restart any workers. + await sleep( 5000 ); } } } diff --git a/js/server/puppeteerCTClient.js b/js/server/puppeteerCTClient.js index e7047f0..b76c9bb 100644 --- a/js/server/puppeteerCTClient.js +++ b/js/server/puppeteerCTClient.js @@ -13,10 +13,10 @@ process.on( 'SIGINT', () => process.exit() ); ( async () => { - assert( process.argv[ 2 ], 'usage: node puppeteerHelpCT {{SOME_IDENTIFIER_HERE}}' ); + assert( process.argv[ 2 ], 'usage: node puppeteerCTClient {{SOME_IDENTIFIER_HERE}}' ); const url = `https://bayes.colorado.edu/continuous-testing/aqua/html/continuous-loop.html?id=${process.argv[ 2 ]}`; const error = await puppeteerLoad( url, { - waitAfterLoad: 15 * 60 * 1000, // 15 minutes + waitAfterLoad: .5 * 60 * 1000, // 15 minutes allowedTimeToLoad: 120000, puppeteerTimeout: 1000000000, @@ -34,7 +34,10 @@ process.on( 'SIGINT', () => process.exit() ); '--enable-precise-memory-info', // To prevent filling up `/tmp`, see https://github.com/phetsims/aqua/issues/145 - `--user-data-dir=${process.cwd()}/../tmp/puppeteerUserData/` + `--user-data-dir=${process.cwd()}/../tmp/puppeteerUserData/`, + + // Fork child processes directly to prevent orphaned chrome instances from lingering on bayes, https://github.com/phetsims/aqua/issues/150#issuecomment-1170140994 + '--no-zygote', '--no-sandbox' ] } } );