fix: reduce deadlock potential (NUWCDIVNPT#216)

csmig · Mar 30, 2021 · 698418d · 698418d
1 parent 3632841
commit 698418d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/api/source/service/mysql/AssetService.js b/api/source/service/mysql/AssetService.js
@@ -38,7 +38,7 @@ exports.queryAssets = async function (inProjection = [], inPredicates = {}, elev
 
     // PROJECTIONS
     if (inProjection.includes('adminStats')) {
-      let statsJoin = 'stats_asset_stig sas WHERE sas.assetId = a.assetId'
+      let statsJoin = 'stig_asset_map sam inner join stats_asset_stig sas on (sam.assetId=sas.assetId and sam.benchmarkId=sas.benchmarkId) WHERE sas.assetId = a.assetId'
       columns.push(`json_object(
         'stigCount', COUNT(distinct sa.saId),
         'stigAssignedCount', COUNT(distinct usa.saId),

diff --git a/api/source/service/mysql/utils.js b/api/source/service/mysql/utils.js
@@ -341,6 +341,7 @@ module.exports.updateStatsAssetStig = async function(connection, { collectionId,
       group by
         sa.assetId,
         sa.benchmarkId
+      FOR UPDATE
       `
 
     const sqlUpsert = `
@@ -392,7 +393,7 @@ module.exports.updateStatsAssetStig = async function(connection, { collectionId,
       let bindsUpsert = results.map( r => Object.values(r))
       let stats;
       [stats] = await connection.query(sqlUpsert, [bindsUpsert])
-      await connection.query(sqlIntegrity)
+      // await connection.query(sqlIntegrity)
       return stats
     }
     else {