From: Alex Lam S.L Date: Sat, 8 Aug 2020 19:10:19 +0000 (+0100) Subject: improve `ufuzz` duty cycle heuristic (#4045) X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=e2237d8cd26e27a284c6a564762345e84a365dae;p=UglifyJS.git improve `ufuzz` duty cycle heuristic (#4045) --- diff --git a/.github/workflows/ufuzz.yml b/.github/workflows/ufuzz.yml index 4dd9de2e..4a55eb48 100644 --- a/.github/workflows/ufuzz.yml +++ b/.github/workflows/ufuzz.yml @@ -38,10 +38,10 @@ jobs: while !(npm install); do echo "'npm install' failed - retrying..."; done PERIOD=1800000 if [[ $CAUSE == "schedule" ]]; then - PERIOD=$(( 3600 * `node test/ufuzz/actions $BASE_URL $TOKEN` )) + PERIOD=`node test/ufuzz/actions $BASE_URL $TOKEN` fi if (( $PERIOD == 0 )); then - echo "too many jobs in queue - exiting..." + echo "too many jobs in queue - skipping..." else node test/ufuzz/job $PERIOD fi diff --git a/test/ufuzz/actions.js b/test/ufuzz/actions.js index c4438d8d..53754a75 100644 --- a/test/ufuzz/actions.js +++ b/test/ufuzz/actions.js @@ -22,28 +22,28 @@ function read(url, callback) { }); } -var in_progress = 0, queued = 0; +var queued = 0, total = 0; +var earliest, latest; process.on("beforeExit", function() { if (queued > 3) { process.stdout.write("0"); + } else if (total < 2) { + process.stdout.write("3600000"); } else { - process.stdout.write(Math.min(1000 * 20 / in_progress, 1500).toFixed(0)); + process.stdout.write(Math.min(20 * (latest - earliest) / (total - 1), 5400000).toFixed(0)); } }); -read(base + "/actions/workflows/ufuzz.yml/runs", function(reply) { +read(base + "/actions/workflows/ufuzz.yml/runs?event=schedule", function(reply) { reply.workflow_runs.filter(function(workflow) { return /^(in_progress|queued|)$/.test(workflow.status); }).forEach(function(workflow) { read(workflow.jobs_url, function(reply) { reply.jobs.forEach(function(job) { - switch (job.status) { - case "in_progress": - in_progress++; - break; - case "queued": - queued++; - break; - } + if (job.status == "queued") queued++; + total++; + var start = new Date(job.started_at); + if (!(earliest < start)) earliest = start; + if (!(latest > start)) latest = start; }); }); });