Merge pull request #4544 from coralproject/hotfix/unarchiving-timeout

Hotfix/unarchiving timeout
coralproject · Feb 15, 2024 · 3b9f452 · 3b9f452
2 parents 5b5efb8 + 9758e54
commit 3b9f452
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 15 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.7.3",
+  "version": "8.7.4",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [

diff --git a/common/package-lock.json b/common/package-lock.json
diff --git a/common/package.json b/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "8.7.3",
+  "version": "8.7.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/config/package-lock.json b/config/package-lock.json
diff --git a/config/package.json b/config/package.json
@@ -1,6 +1,6 @@
 {
   "name": "common",
-  "version": "8.7.3",
+  "version": "8.7.4",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

diff --git a/server/package-lock.json b/server/package-lock.json
diff --git a/server/package.json b/server/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@coralproject/talk",
-  "version": "8.7.3",
+  "version": "8.7.4",
   "author": "The Coral Project",
   "homepage": "https://coralproject.net/",
   "sideEffects": [

diff --git a/server/src/core/server/models/story/story.ts b/server/src/core/server/models/story/story.ts
@@ -893,6 +893,7 @@ export async function retrieveStoryToBeUnarchived(
     },
     {
       returnOriginal: false,
+      maxTimeMS: 30 * 60 * 1000,
     }
   );
 

diff --git a/server/src/core/server/queue/tasks/unarchiver.ts b/server/src/core/server/queue/tasks/unarchiver.ts
@@ -84,7 +84,7 @@ const createJobProcessor = ({
       throw new Error("unable to unarchive story");
     }
 
-    log.debug({ took: timer() }, "attempted unarchive operation ended");
+    log.info({ storyID, took: timer() }, "attempted unarchive operation ended");
   };
 };
 
@@ -101,5 +101,6 @@ export function createUnarchiverTask(
     jobIdGenerator: ({ tenantID, storyID }) =>
       `${tenantID}:${storyID}:unarchive`,
     attempts: 1,
+    timeout: 1 * 60 * 60 * 1000,
   });
 }
diff --git a/server/src/core/server/services/archive/index.ts b/server/src/core/server/services/archive/index.ts
@@ -112,7 +112,9 @@ export async function unarchiveStory(
   const logger = log.child({ storyID: id });
   logger.info("starting to unarchive story");
 
-  const targetStory = await mongo.stories().findOne({ id, tenantID });
+  const targetStory = await mongo
+    .stories()
+    .findOne({ id, tenantID }, { maxTimeMs: 30 * 60 * 1000 });
   if (!targetStory) {
     throw new StoryNotFoundError(id);
   }
@@ -203,7 +205,7 @@ async function moveDocuments<T extends { id: string }>({
   let deleteIDs: string[] = [];
   const allIDs: string[] = [];
 
-  const selectionCursor = source.find(filter);
+  const selectionCursor = source.find(filter, { maxTimeMs: 30 * 60 * 1000 });
 
   while (await selectionCursor.hasNext()) {
     const document = await selectionCursor.next();