'run-analysis' script should schedule retries for A/B tests even after chart analysis failure.

dewei-zhu · dewei-zhu · commit ec25a93d3286 · 2020-11-21T01:27:13.000Z
https://bugs.webkit.org/show_bug.cgi?id=219116 Reviewed by Ryosuke Niwa. Anlyzing charts and schedule retries for A/B tests on run-analysis script are independent task. It should not skip scheduling retries even when chart analysis part fails. * tools/run-analysis.js: (async analysisLoop): Change the logic so that chart analysis failure will not stop scheduling retries. Fix a typo for 'notificationRemoteAPI'. Canonical link: https://commits.webkit.org/231849@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@270140 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Websites/perf.webkit.org/ChangeLog b/Websites/perf.webkit.org/ChangeLog
@@ -1,3 +1,17 @@
+2020-11-20  Dewei Zhu  <dewei_zhu@apple.com>
+
+        'run-analysis' script should schedule retries for A/B tests even after chart analysis failure.
+        https://bugs.webkit.org/show_bug.cgi?id=219116
+
+        Reviewed by Ryosuke Niwa.
+
+        Anlyzing charts and schedule retries for A/B tests on run-analysis script are independent task.
+        It should not skip scheduling retries even when chart analysis part fails.
+
+        * tools/run-analysis.js:
+        (async analysisLoop): Change the logic so that chart analysis failure will not stop scheduling retries.
+        Fix a typo for 'notificationRemoteAPI'.
+
 2020-11-18  Dewei Zhu  <dewei_zhu@apple.com>
 
         Fix a bug that platform groups cannot be updated on 'admin/platform'.
diff --git a/Websites/perf.webkit.org/tools/run-analysis.js b/Websites/perf.webkit.org/tools/run-analysis.js
@@ -28,13 +28,11 @@ function main(argv)
 
 async function analysisLoop(options)
 {
-    let secondsToSleep;
+    const secondsToSleep = options['--seconds-to-sleep'];
     try {
         const serverConfig = JSON.parse(fs.readFileSync(options['--server-config-json'], 'utf-8'));
-        const notificationConfig = JSON.parse(fs.readFileSync(options['--notification-config-json'], 'utf-8'));
         const analysisRangeInDays = options['--analysis-range-in-days'];
-        const maximumRetryFactor = options['--max-retry-factor'];
-        secondsToSleep = options['--seconds-to-sleep'];
+
         global.RemoteAPI = new RemoteAPI(serverConfig.server);
         PrivilegedAPI.configure(serverConfig.slave.name, serverConfig.slave.password);
 
@@ -47,19 +45,25 @@ async function analysisLoop(options)
 
         console.log(`Start analyzing last ${analysisRangeInDays} days measurement sets.`);
         await analyzer.analyzeOnce();
+    } catch (error) {
+        console.error(`Failed to analyze measurement sets due to ${error}`);
+    }
 
+    try {
+        const notificationConfig = JSON.parse(fs.readFileSync(options['--notification-config-json'], 'utf-8'));
+        const maximumRetryFactor = options['--max-retry-factor'];
         const testGroupsMayNeedMoreRequests = await TestGroup.fetchAllThatMayNeedMoreRequests();
         await createAdditionalBuildRequestsForTestGroupsWithFailedRequests(testGroupsMayNeedMoreRequests, maximumRetryFactor);
 
         const testGroupsNeedNotification = await TestGroup.fetchAllWithNotificationReady();
-        const notificationRemoveAPI = new RemoteAPI(notificationConfig.notificationServerConfig);
+        const notificationRemoteAPI = new RemoteAPI(notificationConfig.notificationServerConfig);
         const notificationMessageConfig = notificationConfig.notificationMessageConfig;
         const notifier = new AnalysisResultsNotifier(notificationMessageConfig.messageTemplate, notificationMessageConfig.finalizeScript,
-            notificationMessageConfig.messageConstructionRules, notificationRemoveAPI, notificationConfig.notificationServerConfig.path, new Subprocess);
+            notificationMessageConfig.messageConstructionRules, notificationRemoteAPI, notificationConfig.notificationServerConfig.path, new Subprocess);
 
         await notifier.sendNotificationsForTestGroups(testGroupsNeedNotification);
-    } catch(error) {
-        console.error(`Failed analyze measurement sets due to ${error}`);
+    } catch (error) {
+        console.error(`Failed to retry test groups due to ${error}`);
     }
 
     console.log(`Sleeping for ${secondsToSleep} seconds.`);
