Create rescanBuild API (#853)

- add 2 secs sleep between each retry - add AuditLogs when the error code is 404 (for debugging purposes) - create rescanBuild API to rescan resovles: #852 Signed-off-by: Lan Xia <[email protected]>
adoptium · Mar 21, 2024 · 67e7a51 · 67e7a51
1 parent cb803f2
commit 67e7a51
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 7 deletions.
diff --git a/TestResultSummaryService/BuildProcessor.js b/TestResultSummaryService/BuildProcessor.js
@@ -30,6 +30,10 @@ class BuildProcessor {
                  */
                 task.status = 'Done';
                 await new DataManager().updateBuild(task);
+                await new AuditLogsDB().insertAuditLogs({
+                    action: `[exception] buildInfo.code: ${buildInfo.code}`,
+                    ...task,
+                });
                 return;
             }
             task.buildParams = jenkinsInfo.getBuildParams(buildInfo);

diff --git a/TestResultSummaryService/JenkinsInfo.js b/TestResultSummaryService/JenkinsInfo.js
@@ -16,7 +16,12 @@ const retry = (fn) => {
             } catch (e) {
                 logger.warn(`Try #${i + 1}: connection issue`, arguments);
                 logger.warn(e);
-                if (e.toString().includes('unexpected status code: 404')) {
+                logger.warn(`Sleep 2 secs...`);
+                await Promise.delay(2 * 1000);
+                if (
+                    i === 2 &&
+                    e.toString().includes('unexpected status code: 404')
+                ) {
                     return { code: 404 };
                 }
             }

diff --git a/TestResultSummaryService/routes/deleteBuildsAndChildrenByFields.js b/TestResultSummaryService/routes/deleteBuildsAndChildrenByFields.js
@@ -11,7 +11,10 @@ async function deleteBuilds(req, res) {
     }
 }
 
-async function deleteBuildsAndChildrenByFields(query) {
+async function deleteBuildsAndChildrenByFields(
+    query,
+    deleteChildrenOnly = false
+) {
     if (Object.keys(query).length > 0) {
         if (query.buildNum) query.buildNum = parseInt(query.buildNum, 10);
         if (query._id) query._id = new ObjectID(query._id);
@@ -22,14 +25,14 @@ async function deleteBuildsAndChildrenByFields(query) {
                 'deleteBuildsAndChildrenByFields: ',
                 result[i].buildUrl
             );
-            await deleteBuild(result[i]);
+            await deleteBuild(result[i], deleteChildrenOnly);
         }
         return result;
     }
     return null;
 }
 
-async function deleteBuild(build) {
+async function deleteBuild(build, deleteChildrenOnly = false) {
     const testResultsDB = new TestResultsDB();
     const children = await testResultsDB
         .getData({ parentId: build._id })
@@ -44,10 +47,12 @@ async function deleteBuild(build) {
             await outputDB.deleteOne({ _id: build.tests[j].testOutputId });
         }
     }
-    if (build.buildOutputId) {
-        await outputDB.deleteOne({ _id: build.buildOutputId });
+    if (!deleteChildrenOnly) {
+        if (build.buildOutputId) {
+            await outputDB.deleteOne({ _id: build.buildOutputId });
+        }
+        await testResultsDB.deleteOne({ _id: build._id });
     }
-    await testResultsDB.deleteOne({ _id: build._id });
 }
 
 module.exports = {

diff --git a/TestResultSummaryService/routes/index.js b/TestResultSummaryService/routes/index.js
@@ -47,6 +47,7 @@ app.get('/getTotals', wrap(require('./getTotals')));
 app.get('/parseJenkinsUrl', wrap(require('./parseJenkinsUrl')));
 app.get('/populateDB', wrap(require('./populateDB')));
 app.get('/getFeedbackUrl', wrap(require('./getFeedbackUrl')));
+app.get('/rescanBuild', wrap(require('./rescanBuild')));
 app.get('/testParserViaFile', wrap(require('./test/testParserViaFile')));
 app.get(
     '/testParserViaLogStream',

diff --git a/TestResultSummaryService/routes/rescanBuild.js b/TestResultSummaryService/routes/rescanBuild.js
@@ -0,0 +1,33 @@
+const { TestResultsDB, ObjectID } = require('../Database');
+const {
+    deleteBuildsAndChildrenByFields,
+} = require('./deleteBuildsAndChildrenByFields');
+/*
+ * rescanBuild API updates status field to NotDone based on _id.
+ */
+module.exports = async (req, res) => {
+    const { _id } = req.query;
+    try {
+        if (_id) {
+            const db = new TestResultsDB();
+            const options = { upsert: true };
+            const criteria = { _id: new ObjectID(_id) };
+            // delete all child builds if any
+            const deleteChildrenOnly = true;
+            await deleteBuildsAndChildrenByFields(criteria, deleteChildrenOnly);
+            // set build status
+            const result = await db.update(
+                criteria,
+                { $set: { status: 'NotDone' } },
+                options
+            );
+            res.send(result);
+        } else {
+            res.json({
+                error: 'Please provide _id',
+            });
+        }
+    } catch (err) {
+        res.send({ result: err.toString() });
+    }
+};