diff --git a/packages/cache/__tests__/options.test.ts b/packages/cache/__tests__/options.test.ts index 6b3e0c27..5ec7b146 100644 --- a/packages/cache/__tests__/options.test.ts +++ b/packages/cache/__tests__/options.test.ts @@ -8,7 +8,7 @@ import { const useAzureSdk = true const downloadConcurrency = 8 const timeoutInMs = 30000 -const abortTimeInMs = 3600000 +const segmentTimeoutInMs = 3600000 const uploadConcurrency = 4 const uploadChunkSize = 32 * 1024 * 1024 @@ -19,7 +19,7 @@ test('getDownloadOptions sets defaults', async () => { useAzureSdk, downloadConcurrency, timeoutInMs, - abortTimeInMs + segmentTimeoutInMs }) }) @@ -28,7 +28,7 @@ test('getDownloadOptions overrides all settings', async () => { useAzureSdk: false, downloadConcurrency: 14, timeoutInMs: 20000, - abortTimeInMs: 3600000 + segmentTimeoutInMs: 3600000 } const actualOptions = getDownloadOptions(expectedOptions) diff --git a/packages/cache/src/internal/downloadUtils.ts b/packages/cache/src/internal/downloadUtils.ts index 7852165b..e93a93f0 100644 --- a/packages/cache/src/internal/downloadUtils.ts +++ b/packages/cache/src/internal/downloadUtils.ts @@ -249,9 +249,9 @@ export async function downloadCacheStorageSDK( try { downloadProgress.startDisplayTimer() - const abortTimeInMs = - options.abortTimeInMs === undefined ? 3600000 : options.abortTimeInMs - const abortSignal = AbortController.timeout(abortTimeInMs) + const segmentTimeoutInMs = + options.segmentTimeoutInMs === undefined ? 3600000 : options.segmentTimeoutInMs + const abortSignal = AbortController.timeout(segmentTimeoutInMs) abortSignal.addEventListener('abort', () => { core.warning('Cache download aborted, segment download timed out.') }) diff --git a/packages/cache/src/options.ts b/packages/cache/src/options.ts index b5563268..eefe9731 100644 --- a/packages/cache/src/options.ts +++ b/packages/cache/src/options.ts @@ -48,11 +48,11 @@ export interface DownloadOptions { timeoutInMs?: number /** - * Time after which download should be aborted if stuck + * Time after which a segment download should be aborted if stuck * * @default 3600000 */ - abortTimeInMs?: number + segmentTimeoutInMs?: number } /** @@ -92,7 +92,7 @@ export function getDownloadOptions(copy?: DownloadOptions): DownloadOptions { useAzureSdk: true, downloadConcurrency: 8, timeoutInMs: 30000, - abortTimeInMs: 3600000 + segmentTimeoutInMs: 3600000 } if (copy) { @@ -108,15 +108,15 @@ export function getDownloadOptions(copy?: DownloadOptions): DownloadOptions { result.timeoutInMs = copy.timeoutInMs } - if (typeof copy.abortTimeInMs === 'number') { - result.abortTimeInMs = copy.abortTimeInMs + if (typeof copy.segmentTimeoutInMs === 'number') { + result.segmentTimeoutInMs = copy.segmentTimeoutInMs } } core.debug(`Use Azure SDK: ${result.useAzureSdk}`) core.debug(`Download concurrency: ${result.downloadConcurrency}`) core.debug(`Request timeout (ms): ${result.timeoutInMs}`) - core.debug(`Abort time (ms): ${result.abortTimeInMs}`) + core.debug(`Segment download timeout (ms): ${result.segmentTimeoutInMs}`) return result }