Overlay: Reorder available disk space check

This commit is contained in:
Kasper Svendsen
2025-11-19 07:54:05 +01:00
parent 726a2a01b8
commit ed80d6e5e9
2 changed files with 16 additions and 16 deletions
+7 -7
View File
@@ -86920,7 +86920,12 @@ async function getOverlayDatabaseMode(codeql, features, languages, sourceRoot, b
logger.info(
`Setting overlay database mode to ${overlayDatabaseMode} from the CODEQL_OVERLAY_DATABASE_MODE environment variable.`
);
} else {
} else if (await isOverlayAnalysisFeatureEnabled(
features,
codeql,
languages,
codeScanningConfig
)) {
const diskUsage = await checkDiskUsage(logger);
if (diskUsage === void 0 || diskUsage.numAvailableBytes < OVERLAY_MINIMUM_AVAILABLE_DISK_SPACE_BYTES) {
const diskSpaceMb = diskUsage === void 0 ? 0 : diskUsage.numAvailableBytes / 1e6;
@@ -86929,12 +86934,7 @@ async function getOverlayDatabaseMode(codeql, features, languages, sourceRoot, b
logger.info(
`Setting overlay database mode to ${overlayDatabaseMode} due to insufficient disk space (${diskSpaceMb} MB).`
);
} else if (await isOverlayAnalysisFeatureEnabled(
features,
codeql,
languages,
codeScanningConfig
)) {
} else {
if (isAnalyzingPullRequest()) {
overlayDatabaseMode = "overlay" /* Overlay */;
useOverlayDatabaseCaching = true;
+9 -9
View File
@@ -679,7 +679,14 @@ export async function getOverlayDatabaseMode(
`Setting overlay database mode to ${overlayDatabaseMode} ` +
"from the CODEQL_OVERLAY_DATABASE_MODE environment variable.",
);
} else {
} else if (
await isOverlayAnalysisFeatureEnabled(
features,
codeql,
languages,
codeScanningConfig,
)
) {
const diskUsage = await checkDiskUsage(logger);
if (
diskUsage === undefined ||
@@ -693,14 +700,7 @@ export async function getOverlayDatabaseMode(
`Setting overlay database mode to ${overlayDatabaseMode} ` +
`due to insufficient disk space (${diskSpaceMb} MB).`,
);
} else if (
await isOverlayAnalysisFeatureEnabled(
features,
codeql,
languages,
codeScanningConfig,
)
) {
} else {
if (isAnalyzingPullRequest()) {
overlayDatabaseMode = OverlayDatabaseMode.Overlay;
useOverlayDatabaseCaching = true;