fix: Increase process recurrence timeout (#9665)

ParabolInc · Apr 25, 2024 · f4e0cda · f4e0cda
1 parent 42c432e
commit f4e0cda
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 12 deletions.
diff --git a/packages/chronos/chronos.ts b/packages/chronos/chronos.ts
@@ -102,16 +102,16 @@ const chronos = () => {
     processRecurrence: {
       onTick: () => {
         const query = `
-        mutation ProcessRecurrence{
-          processRecurrence{
-            ... on ProcessRecurrenceSuccess {
-              meetingsStarted
-              meetingsEnded
+          mutation ProcessRecurrence {
+            processRecurrence{
+              ... on ProcessRecurrenceSuccess {
+                meetingsStarted
+                meetingsEnded
+              }
             }
           }
-        }
-      `
-        publishWebhookGQL(query, {})
+        `
+        publishWebhookGQL(query, {}, {longRunning: true})
       },
       cronTime: CHRONOS_PROCESS_RECURRENCE
     }

diff --git a/packages/server/utils/PubSubPromise.ts b/packages/server/utils/PubSubPromise.ts
@@ -5,6 +5,7 @@ import numToBase64 from './numToBase64'
 import sendToSentry from './sendToSentry'
 
 const STANDARD_TIMEOUT = ms('10s')
+const LONG_TIMEOUT = ms('60s')
 const ADHOC_TIMEOUT = ms('10m')
 
 interface Job {
@@ -17,6 +18,7 @@ const {SERVER_ID} = process.env
 interface BaseRequest {
   executorServerId?: string
   isAdHoc?: boolean
+  longRunning?: boolean
 }
 
 export default class PubSubPromise<Request extends BaseRequest, Response> {
@@ -51,8 +53,8 @@ export default class PubSubPromise<Request extends BaseRequest, Response> {
     return new Promise<Response>((resolve, reject) => {
       const nextJob = numToBase64(this.jobCounter++)
       const jobId = `${SERVER_ID}:${nextJob}`
-      const {isAdHoc} = request
-      const timeout = isAdHoc ? ADHOC_TIMEOUT : STANDARD_TIMEOUT
+      const {isAdHoc, longRunning} = request
+      const timeout = isAdHoc ? ADHOC_TIMEOUT : longRunning ? LONG_TIMEOUT : STANDARD_TIMEOUT
       const timeoutId = setTimeout(() => {
         delete this.jobs[jobId]
         reject(new Error('TIMEOUT'))

diff --git a/packages/server/utils/publishWebhookGQL.ts b/packages/server/utils/publishWebhookGQL.ts
@@ -3,13 +3,18 @@ import ServerAuthToken from '../database/types/ServerAuthToken'
 import getGraphQLExecutor from './getGraphQLExecutor'
 import sendToSentry from './sendToSentry'
 
-const publishWebhookGQL = async (query: string, variables: Variables) => {
+interface PublishOptions {
+  longRunning?: boolean
+}
+
+const publishWebhookGQL = async (query: string, variables: Variables, options?: PublishOptions) => {
   try {
     return await getGraphQLExecutor().publish({
       authToken: new ServerAuthToken(),
       query,
       variables,
-      isPrivate: true
+      isPrivate: true,
+      ...options
     })
   } catch (e) {
     const error = e instanceof Error ? e : new Error('GQL executor failed to publish')