Merge branch 'BUDI-8064/doc-writethrough' into BUDI-8046/scim-logger

packages/backend-core/src/cache/docWritethrough.ts

@@ -1,41 +1,38 @@
-import { AnyDocument, Database, LockName, LockType } from "@budibase/types"
+import { AnyDocument, Database } from "@budibase/types"
 
 import { JobQueue, createQueue } from "../queue"
 import * as dbUtils from "../db"
-import { string } from "yargs"
-import { db } from ".."
-import { locks } from "../redis"
-import { Duration } from "../utils"
+import { logWarn } from "../logging"
 
 interface ProcessDocMessage {
   dbName: string
   docId: string
-
   data: Record<string, any>
 }
 
 export const docWritethroughProcessorQueue = createQueue<ProcessDocMessage>(
-  JobQueue.DOC_WRITETHROUGH_QUEUE
+  JobQueue.DOC_WRITETHROUGH_QUEUE,
+  {
+    jobOptions: {
+      // We might have plenty of 409, we want to allow running almost infinitely
+      attempts: Number.MAX_SAFE_INTEGER,
+    },
+  }
 )
 
 class DocWritethroughProcessor {
   init() {
     docWritethroughProcessorQueue.process(async message => {
-      const result = await locks.doWithLock(
-        {
-          type: LockType.TRY_ONCE,
-          name: LockName.PERSIST_DOC_WRITETHROUGH,
-          resource: `${message.data.dbName}:${message.data.docId}`,
-          ttl: Duration.fromSeconds(60).toMs(),
-        },
-        async () => {
-          await this.persistToDb(message.data)
+      try {
+        await this.persistToDb(message.data)
+      } catch (err: any) {
+        if (err.status === 409) {
+          logWarn(`409 conflict in doc-writethrough cache`)
+          // If we get a 409, it means that another job updated it meanwhile. We want to retry it to persist it again.
+          throw new Error(`Conflict persisting message ${message.id}`)
         }
-      )
-      if (!result.executed) {
-        throw new Error(
-          `Error persisting docWritethrough message: ${message.id}`
-        )
+
+        throw err
       }
     })
     return this

packages/backend-core/src/redis/redlockImpl.ts

@@ -82,11 +82,6 @@ type SuccessfulRedlockExecution<T> = {
 }
 type UnsuccessfulRedlockExecution = {
   executed: false
-  reason: UnsuccessfulRedlockExecutionReason
-}
-
-export const enum UnsuccessfulRedlockExecutionReason {
-  LockTakenWithTryOnce = "LOCK_TAKEN_WITH_TRY_ONCE",
 }
 
 type RedlockExecution<T> =
@@ -146,10 +141,7 @@ export async function doWithLock<T>(
       if (opts.type === LockType.TRY_ONCE) {
         // don't throw for try-once locks, they will always error
         // due to retry count (0) exceeded
-        return {
-          executed: false,
-          reason: UnsuccessfulRedlockExecutionReason.LockTakenWithTryOnce,
-        }
+        return { executed: false }
       } else {
         throw e
       }

packages/types/src/documents/global/userGroup.ts

@@ -24,7 +24,7 @@ export interface GroupUser {
 }
 
 export interface UserGroupRoles {
-  [key: string]: string
+  [key: string]: string | undefined
 }
 
 export interface SearchGroupRequest {}

packages/types/src/sdk/events/userGroup.ts

@@ -48,7 +48,7 @@ export interface GroupAddedOnboardingEvent extends BaseEvent {
 }
 
 export interface GroupPermissionsEditedEvent extends BaseEvent {
-  permissions: Record<string, string>
+  permissions: Record<string, string | undefined>
   groupId: string
   audited: {
     name: string

packages/types/src/sdk/locks.ts

@@ -23,7 +23,6 @@ export enum LockName {
   APP_MIGRATION = "app_migrations",
   PROCESS_AUTO_COLUMNS = "process_auto_columns",
   PROCESS_USER_INVITE = "process_user_invite",
-  PERSIST_DOC_WRITETHROUGH = "persist_doc_writethrough",
 }
 
 export type LockOptions = {