Skip to content

Commit f278d2f

Browse files
committed
Revert "feat(worker/accessorHandlers/http(Proxy)): add retries to getPackagesToRemove for resiliance"
This reverts commit 4189872.
1 parent 9599603 commit f278d2f

2 files changed

Lines changed: 2 additions & 40 deletions

File tree

shared/packages/worker/src/worker/accessorHandlers/http.ts

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -350,26 +350,7 @@ export class HTTPAccessorHandle<Metadata> extends GenericAccessorHandle<Metadata
350350
}
351351
/** */
352352
private async getPackagesToRemove(): Promise<DelayPackageRemovalEntry[]> {
353-
const RETRY_COUNT = 5
354-
let retries = 0
355-
let packagesToRemove: DelayPackageRemovalEntry[] | undefined = undefined
356-
let lastError
357-
do {
358-
try {
359-
packagesToRemove = await this.fetchJSON(this.deferRemovePackagesPath)
360-
} catch (e) {
361-
if (e instanceof Error && e.message.match(/Timeout when fetching/)) {
362-
lastError = e
363-
} else {
364-
throw e
365-
}
366-
}
367-
retries++
368-
} while (packagesToRemove === undefined && retries < RETRY_COUNT)
369-
if (packagesToRemove === undefined && retries >= RETRY_COUNT && lastError) {
370-
throw lastError
371-
}
372-
return packagesToRemove ?? []
353+
return (await this.fetchJSON(this.deferRemovePackagesPath)) ?? []
373354
}
374355
private async storePackagesToRemove(packagesToRemove: DelayPackageRemovalEntry[]): Promise<void> {
375356
await this.storeJSON(this.deferRemovePackagesPath, packagesToRemove)

shared/packages/worker/src/worker/accessorHandlers/httpProxy.ts

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -377,26 +377,7 @@ export class HTTPProxyAccessorHandle<Metadata> extends GenericAccessorHandle<Met
377377
}
378378
/** */
379379
private async getPackagesToRemove(): Promise<DelayPackageRemovalEntry[]> {
380-
const RETRY_COUNT = 5
381-
let retries = 0
382-
let packagesToRemove: DelayPackageRemovalEntry[] | undefined = undefined
383-
let lastError
384-
do {
385-
try {
386-
packagesToRemove = await this.fetchJSON(this.deferRemovePackagesPath)
387-
} catch (e) {
388-
if (e instanceof Error && e.message.match(/Timeout when fetching/)) {
389-
lastError = e
390-
} else {
391-
throw e
392-
}
393-
}
394-
retries++
395-
} while (packagesToRemove === undefined && retries < RETRY_COUNT)
396-
if (packagesToRemove === undefined && retries >= RETRY_COUNT && lastError) {
397-
throw lastError
398-
}
399-
return packagesToRemove ?? []
380+
return (await this.fetchJSON(this.deferRemovePackagesPath)) ?? []
400381
}
401382
private async storePackagesToRemove(packagesToRemove: DelayPackageRemovalEntry[]): Promise<void> {
402383
await this.storeJSON(this.deferRemovePackagesPath, packagesToRemove)

0 commit comments

Comments
 (0)