self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-23 22:36:32 +02:00
Code Issues Releases Activity

All: Fixes #8561: Fix OneDrive sync crash on throttle (#9143)

Browse Source
This commit is contained in:
Henry Heino
2023-11-07 03:55:38 -08:00
committed by GitHub
parent 7b2cf0e483
commit 88b44a0f74
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/lib/onedrive-api.ts
View File

@@ -343,14 +343,21 @@ export default class OneDriveApi {
await handleRequestRepeat(error);
continue;
} else if (error?.code === 'activityLimitReached' && response?.headers?._headers['retry-after'][0] && !isNaN(Number(response?.headers?._headers['retry-after'][0]))) {
} else if (error?.code === 'activityLimitReached') {
// Wait for OneDrive throttling
// Relavent Microsoft Docs: https://docs.microsoft.com/en-us/sharepoint/dev/general-development/how-to-avoid-getting-throttled-or-blocked-in-sharepoint-online#best-practices-to-handle-throttling
// Decrement retry count as multiple sync threads will cause repeated throttling errors - this will wait until throttling is resolved to continue, preventing a hard stop on the sync
i--;
const sleepSeconds = response.headers._headers['retry-after'][0];
const retryAfter = response.headers?.get?.('retry-after') ?? '1';
let sleepSeconds = parseFloat(retryAfter);
if (isNaN(sleepSeconds)) {
sleepSeconds = 5;
}
logger.info(`OneDrive Throttle, sync thread sleeping for ${sleepSeconds} seconds...`);
await handleRequestRepeat(error, Number(sleepSeconds));
await handleRequestRepeat(error, sleepSeconds);
continue;
} else if (error.code === 'itemNotFound' && method === 'DELETE') {
// Deleting a non-existing item is ok - noop