actions/cache
1
0
Fork 0
mirror of https://code.forgejo.org/actions/cache.git synced 2024-12-23 12:36:01 +01:00
Code Activity

Bad implementation of parallel await

Browse source
This commit is contained in:
Josh Gross 2019-12-17 16:17:55 -05:00
parent b425e87f79
commit ba6476e454
3 changed files with 78 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
dist/restore/index.js vendored
View file

@ -1615,6 +1615,28 @@ function commitCache(restClient, cacheId, filesize) {
return yield restClient.create(`caches/${cacheId.toString()}`, commitCacheRequest, requestOptions);
});
}
function parallelAwait(queue, concurrency) {
var _a;
return __awaiter(this, void 0, void 0, function* () {
const workQueue = queue.reverse();
let completedWork = [];
let entries = queue.length;
while (entries > 0) {
if (entries < concurrency) {
completedWork.push(yield Promise.all(workQueue));
}
else {
let promises = [];
let i;
for (i = 0; i < concurrency; i++) {
promises.push((_a = workQueue.pop(), (_a !== null && _a !== void 0 ? _a : Promise.resolve())));
}
completedWork.push(yield Promise.all(promises));
}
}
return completedWork;
});
}
function saveCache(cacheId, archivePath) {
return __awaiter(this, void 0, void 0, function* () {
const restClient = createRestClient();
@ -1629,13 +1651,14 @@ function saveCache(cacheId, archivePath) {
const chunkSize = offset + MAX_CHUNK_SIZE > fileSize ? fileSize - offset : MAX_CHUNK_SIZE;
const end = offset + chunkSize - 1;
const chunk = fs.createReadStream(archivePath, { fd, start: offset, end, autoClose: false });
uploads.push(yield uploadChunk(restClient, resourceUrl, chunk, offset, end)); // Making this serial
uploads.push(uploadChunk(restClient, resourceUrl, chunk, offset, end));
offset += MAX_CHUNK_SIZE;
}
fs.closeSync(fd);
core.debug("Awaiting all uploads");
const responses = yield parallelAwait(uploads, 4);
fs.closeSync(fd);
//const responses = await Promise.all(uploads);
const failedResponse = uploads.find(x => !isSuccessStatusCode(x.statusCode));
const failedResponse = responses.find(x => !isSuccessStatusCode(x.statusCode));
if (failedResponse) {
throw new Error(`Cache service responded with ${failedResponse.statusCode} during chunk upload.`);
}

29
dist/save/index.js vendored
View file

@ -1615,6 +1615,28 @@ function commitCache(restClient, cacheId, filesize) {
return yield restClient.create(`caches/${cacheId.toString()}`, commitCacheRequest, requestOptions);
});
}
function parallelAwait(queue, concurrency) {
var _a;
return __awaiter(this, void 0, void 0, function* () {
const workQueue = queue.reverse();
let completedWork = [];
let entries = queue.length;
while (entries > 0) {
if (entries < concurrency) {
completedWork.push(yield Promise.all(workQueue));
}
else {
let promises = [];
let i;
for (i = 0; i < concurrency; i++) {
promises.push((_a = workQueue.pop(), (_a !== null && _a !== void 0 ? _a : Promise.resolve())));
}
completedWork.push(yield Promise.all(promises));
}
}
return completedWork;
});
}
function saveCache(cacheId, archivePath) {
return __awaiter(this, void 0, void 0, function* () {
const restClient = createRestClient();
@ -1629,13 +1651,14 @@ function saveCache(cacheId, archivePath) {
const chunkSize = offset + MAX_CHUNK_SIZE > fileSize ? fileSize - offset : MAX_CHUNK_SIZE;
const end = offset + chunkSize - 1;
const chunk = fs.createReadStream(archivePath, { fd, start: offset, end, autoClose: false });
uploads.push(yield uploadChunk(restClient, resourceUrl, chunk, offset, end)); // Making this serial
uploads.push(uploadChunk(restClient, resourceUrl, chunk, offset, end));
offset += MAX_CHUNK_SIZE;
}
fs.closeSync(fd);
core.debug("Awaiting all uploads");
const responses = yield parallelAwait(uploads, 4);
fs.closeSync(fd);
//const responses = await Promise.all(uploads);
const failedResponse = uploads.find(x => !isSuccessStatusCode(x.statusCode));
const failedResponse = responses.find(x => !isSuccessStatusCode(x.statusCode));
if (failedResponse) {
throw new Error(`Cache service responded with ${failedResponse.statusCode} during chunk upload.`);
}

30
src/cacheHttpClient.ts
View file

@ -174,6 +174,26 @@ async function commitCache(
);
}
async function parallelAwait(queue: Promise<any>[], concurrency: number): Promise<any[]> {
const workQueue = queue.reverse();
let completedWork: any[] = [];
let entries = queue.length;
while (entries > 0) {
if (entries < concurrency) {
completedWork.push(await Promise.all(workQueue));
} else {
let promises: Promise<any>[] = [];
let i: number;
for (i = 0; i < concurrency; i++) {
promises.push(workQueue.pop() ?? Promise.resolve());
}
completedWork.push(await Promise.all(promises));
}
}
return completedWork;
}
export async function saveCache(
cacheId: number,
archivePath: string
@ -184,7 +204,7 @@ export async function saveCache(
// Upload Chunks
const fileSize = fs.statSync(archivePath).size;
const resourceUrl = getCacheApiUrl() + "caches/" + cacheId.toString();
const uploads: IRestResponse<void>[] = [];
const uploads: Promise<IRestResponse<void>>[] = [];
const fd = fs.openSync(archivePath, "r"); // Use the same fd for serial reads? Will this work for parallel too?
let offset = 0;
@ -192,16 +212,18 @@ export async function saveCache(
const chunkSize = offset + MAX_CHUNK_SIZE > fileSize ? fileSize - offset : MAX_CHUNK_SIZE;
const end = offset + chunkSize - 1;
const chunk = fs.createReadStream(archivePath, { fd, start: offset, end, autoClose: false });
uploads.push(await uploadChunk(restClient, resourceUrl, chunk, offset, end)); // Making this serial
uploads.push(uploadChunk(restClient, resourceUrl, chunk, offset, end));
offset += MAX_CHUNK_SIZE;
}
core.debug("Awaiting all uploads");
const responses = await parallelAwait(uploads, 4);
fs.closeSync(fd);
core.debug("Awaiting all uploads");
//const responses = await Promise.all(uploads);
const failedResponse = uploads.find(
const failedResponse = responses.find(
x => !isSuccessStatusCode(x.statusCode)
);
if (failedResponse) {