Address review comments

Author: henrymercer

lib/init-action-post.js

@@ -768,14 +768,30 @@ export async function getOverlayDatabaseMode(
       codeScanningConfig,
     )
   ) {
-    const diskUsage = await checkDiskUsage(logger);
     const performResourceChecks = !(await features.getValue(
       Feature.OverlayAnalysisSkipResourceChecks,
       codeql,
     ));
+    const checkOverlayStatus = await features.getValue(
+      Feature.OverlayAnalysisStatusCheck,
+    );
+    const diskUsage =
+      performResourceChecks || checkOverlayStatus
+        ? await checkDiskUsage(logger)
+        : undefined;
     if (
+      performResourceChecks &&
+      !(await runnerSupportsOverlayAnalysis(diskUsage, ramInput, logger))
+    ) {
+      overlayDatabaseMode = OverlayDatabaseMode.None;
+    } else if (checkOverlayStatus && diskUsage === undefined) {
+      logger.warning(
+        `Unable to determine disk usage, therefore setting overlay database mode to ${OverlayDatabaseMode.None}.`,
+      );
+      overlayDatabaseMode = OverlayDatabaseMode.None;
+    } else if (
+      checkOverlayStatus &&
       diskUsage &&
-      (await features.getValue(Feature.OverlayAnalysisStatusCheck)) &&
       (await shouldSkipOverlayAnalysis(codeql, languages, diskUsage, logger))
     ) {
       logger.info(
@@ -785,11 +801,6 @@ export async function getOverlayDatabaseMode(
       );
       overlayDatabaseMode = OverlayDatabaseMode.None;
       skippedDueToCachedStatus = true;
-    } else if (
-      performResourceChecks &&
-      !(await runnerSupportsOverlayAnalysis(diskUsage, ramInput, logger))
-    ) {
-      overlayDatabaseMode = OverlayDatabaseMode.None;
     } else if (isAnalyzingPullRequest()) {
       overlayDatabaseMode = OverlayDatabaseMode.Overlay;
       useOverlayDatabaseCaching = true;
@@ -1046,14 +1057,15 @@ export async function initConfig(
       config,
       makeDiagnostic(
         "codeql-action/overlay-skipped-due-to-cached-status",
-        "Skipped improved incremental analysis because it failed previously on this runner",
+        "Skipped improved incremental analysis because it failed previously with similar hardware resources",
         {
           attributes: {
             languages: config.languages,
           },
           markdownMessage:
-            `Improved incremental analysis was skipped because it failed previously on this runner. ` +
-            "Improved incremental analysis may require a significant amount of disk space on some repositories. " +
+            `Improved incremental analysis was skipped because it previously failed for this repository ` +
+            `with CodeQL version ${(await inputs.codeql.getVersion()).version} on a runner with similar hardware resources. ` +
+            "Improved incremental analysis may require a significant amount of disk space for some repositories. " +
             "If you want to enable improved incremental analysis, increase the disk space available " +
             "to the runner. If that doesn't help, contact GitHub Support for further assistance.\n\n" +
             "Improved incremental analysis will be automatically retried when the next version of CodeQL is released. " +

lib/init-action.js

@@ -22,6 +22,8 @@ import * as uploadLib from "./upload-lib";
 import * as util from "./util";
 import * as workflow from "./workflow";
 
+const NUM_BYTES_PER_GIB = 1024 * 1024 * 1024;
+
 setupTests(test);
 
 test("init-post action with debug mode off", async (t) => {
@@ -319,8 +321,8 @@ test("saves overlay status when overlay-base analysis did not complete successfu
     delete process.env[EnvVar.ANALYZE_DID_COMPLETE_SUCCESSFULLY];
 
     const diskUsage: util.DiskUsage = {
-      numAvailableBytes: 100 * 1024 * 1024 * 1024,
-      numTotalBytes: 200 * 1024 * 1024 * 1024,
+      numAvailableBytes: 100 * NUM_BYTES_PER_GIB,
+      numTotalBytes: 200 * NUM_BYTES_PER_GIB,
     };
     sinon.stub(util, "checkDiskUsage").resolves(diskUsage);
 
@@ -382,8 +384,8 @@ test("does not save overlay status when OverlayAnalysisStatusSave feature flag i
     delete process.env[EnvVar.ANALYZE_DID_COMPLETE_SUCCESSFULLY];
 
     sinon.stub(util, "checkDiskUsage").resolves({
-      numAvailableBytes: 100 * 1024 * 1024 * 1024,
-      numTotalBytes: 200 * 1024 * 1024 * 1024,
+      numAvailableBytes: 100 * NUM_BYTES_PER_GIB,
+      numTotalBytes: 200 * NUM_BYTES_PER_GIB,
     });
 
     const saveOverlayStatusStub = sinon
@@ -419,8 +421,8 @@ test("does not save overlay status when build successful", async (t) => {
     process.env[EnvVar.ANALYZE_DID_COMPLETE_SUCCESSFULLY] = "true";
 
     sinon.stub(util, "checkDiskUsage").resolves({
-      numAvailableBytes: 100 * 1024 * 1024 * 1024,
-      numTotalBytes: 200 * 1024 * 1024 * 1024,
+      numAvailableBytes: 100 * NUM_BYTES_PER_GIB,
+      numTotalBytes: 200 * NUM_BYTES_PER_GIB,
     });
 
     const saveOverlayStatusStub = sinon
@@ -455,8 +457,8 @@ test("does not save overlay status when overlay not enabled", async (t) => {
     delete process.env[EnvVar.ANALYZE_DID_COMPLETE_SUCCESSFULLY];
 
     sinon.stub(util, "checkDiskUsage").resolves({
-      numAvailableBytes: 100 * 1024 * 1024 * 1024,
-      numTotalBytes: 200 * 1024 * 1024 * 1024,
+      numAvailableBytes: 100 * NUM_BYTES_PER_GIB,
+      numTotalBytes: 200 * NUM_BYTES_PER_GIB,
     });
 
     const saveOverlayStatusStub = sinon