From 10a14413e745e187cac1bc816a54ed95af724c1a Mon Sep 17 00:00:00 2001 From: Josh Gross Date: Mon, 6 Jan 2020 13:51:23 -0500 Subject: [PATCH] Update release binaries --- dist/restore/index.js | 11 ++++++++--- dist/save/index.js | 11 ++++++++--- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/dist/restore/index.js b/dist/restore/index.js index af5fd45..d3825a0 100644 --- a/dist/restore/index.js +++ b/dist/restore/index.js @@ -1626,14 +1626,19 @@ function uploadChunk(restClient, resourceUrl, data, start, end) { }); } function uploadFile(restClient, cacheId, archivePath) { - var _a, _b; return __awaiter(this, void 0, void 0, function* () { // Upload Chunks const fileSize = fs.statSync(archivePath).size; const resourceUrl = getCacheApiUrl() + "caches/" + cacheId.toString(); const fd = fs.openSync(archivePath, "r"); - const concurrency = (_a = Number(process.env["CACHE_UPLOAD_CONCURRENCY"]), (_a !== null && _a !== void 0 ? _a : 4)); // # of HTTP requests in parallel - const MAX_CHUNK_SIZE = (_b = Number(process.env["CACHE_UPLOAD_CHUNK_SIZE"]), (_b !== null && _b !== void 0 ? _b : 32 * 1024 * 1024)); // 32 MB Chunks + let concurrency = Number(process.env["CACHE_UPLOAD_CONCURRENCY"]); // # of HTTP requests in parallel + if (Number.isNaN(concurrency) || concurrency < 0) { + concurrency = 4; + } + let MAX_CHUNK_SIZE = Number(process.env["CACHE_UPLOAD_CHUNK_SIZE"]); + if (Number.isNaN(MAX_CHUNK_SIZE) || MAX_CHUNK_SIZE < 0) { + concurrency = 32 * 1024 * 1024; // 32 MB Chunks + } core.debug(`Concurrency: ${concurrency} and Chunk Size: ${MAX_CHUNK_SIZE}`); const parallelUploads = [...new Array(concurrency).keys()]; core.debug("Awaiting all uploads"); diff --git a/dist/save/index.js b/dist/save/index.js index f46ead5..70caa97 100644 --- a/dist/save/index.js +++ b/dist/save/index.js @@ -1626,14 +1626,19 @@ function uploadChunk(restClient, resourceUrl, data, start, end) { }); } function uploadFile(restClient, cacheId, archivePath) { - var _a, _b; return __awaiter(this, void 0, void 0, function* () { // Upload Chunks const fileSize = fs.statSync(archivePath).size; const resourceUrl = getCacheApiUrl() + "caches/" + cacheId.toString(); const fd = fs.openSync(archivePath, "r"); - const concurrency = (_a = Number(process.env["CACHE_UPLOAD_CONCURRENCY"]), (_a !== null && _a !== void 0 ? _a : 4)); // # of HTTP requests in parallel - const MAX_CHUNK_SIZE = (_b = Number(process.env["CACHE_UPLOAD_CHUNK_SIZE"]), (_b !== null && _b !== void 0 ? _b : 32 * 1024 * 1024)); // 32 MB Chunks + let concurrency = Number(process.env["CACHE_UPLOAD_CONCURRENCY"]); // # of HTTP requests in parallel + if (Number.isNaN(concurrency) || concurrency < 0) { + concurrency = 4; + } + let MAX_CHUNK_SIZE = Number(process.env["CACHE_UPLOAD_CHUNK_SIZE"]); + if (Number.isNaN(MAX_CHUNK_SIZE) || MAX_CHUNK_SIZE < 0) { + concurrency = 32 * 1024 * 1024; // 32 MB Chunks + } core.debug(`Concurrency: ${concurrency} and Chunk Size: ${MAX_CHUNK_SIZE}`); const parallelUploads = [...new Array(concurrency).keys()]; core.debug("Awaiting all uploads");