Browse Source

Merge pull request #19255 from overleaf/em-increase-timeout-docstore-has-ranges

Handle docstore timeouts during history migration

GitOrigin-RevId: 9b00aa039fc9646c24e69bfca51dd8e784434fc6
Eric Mc Sween 2 năm trước cách đây
mục cha
commit
01ce2721c0

+ 6 - 2
services/web/app/src/Features/History/HistoryRangesSupportMigration.js

@@ -145,8 +145,12 @@ async function quickMigration(projectId, direction = 'forwards') {
     projectHasRanges =
     projectHasRanges =
       await DocstoreManager.promises.projectHasRanges(projectId)
       await DocstoreManager.promises.projectHasRanges(projectId)
   } catch (err) {
   } catch (err) {
-    await DocumentUpdaterHandler.promises.unblockProject(projectId)
-    throw err
+    // Docstore request probably timed out. Assume the project has ranges
+    logger.warn(
+      { err, projectId },
+      'Failed to check if project has ranges; proceeding with a resync migration'
+    )
+    projectHasRanges = true
   }
   }
   if (projectHasRanges) {
   if (projectHasRanges) {
     await DocumentUpdaterHandler.promises.unblockProject(projectId)
     await DocumentUpdaterHandler.promises.unblockProject(projectId)