Skip to content

Commit

Permalink
fix: better error handling in json migration
Browse files Browse the repository at this point in the history
Signed-off-by: Alexander Onnikov <[email protected]>
  • Loading branch information
aonnikov committed Dec 6, 2024
1 parent 81ac18e commit 9cab677
Showing 1 changed file with 42 additions and 16 deletions.
58 changes: 42 additions & 16 deletions models/core/src/migration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,9 @@ async function processMigrateJsonForDoc (

if (value.startsWith('{')) {
// For some reason we have documents that are already markups
const jsonId = await saveCollabJson(ctx, storageAdapter, workspaceId, collabId, value)
const jsonId = await retry(5, async () => {
return await saveCollabJson(ctx, storageAdapter, workspaceId, collabId, value)
})
update[attributeName] = jsonId
continue
}
Expand All @@ -371,23 +373,28 @@ async function processMigrateJsonForDoc (
// If document id has changed, save it with new name to ensure we will be able to load it later
const ydocId = makeCollabYdocId(collabId)
if (ydocId !== currentYdocId) {
ctx.info('saving collaborative doc with new name', { collabId, ydocId, currentYdocId })
const buffer = await storageAdapter.read(ctx, workspaceId, currentYdocId)
await storageAdapter.put(
ctx,
workspaceId,
ydocId,
Buffer.concat(buffer as any),
'application/ydoc',
buffer.length
)
await retry(5, async () => {
const stat = await storageAdapter.stat(ctx, workspaceId, currentYdocId)
if (stat !== undefined) {
const buffer = await storageAdapter.read(ctx, workspaceId, currentYdocId)
await storageAdapter.put(
ctx,
workspaceId,
ydocId,
Buffer.concat(buffer as any),
'application/ydoc',
buffer.length
)
}
})
}

const unset = update.$unset ?? {}
update.$unset = { ...unset, [attribute.name]: 1 }
} catch (err: any) {
ctx.warn('failed to process collaborative doc', { workspaceId, collabId, currentYdocId, err: err.message })
} catch (err) {
const error = err instanceof Error ? err.message : String(err)
ctx.warn('failed to process collaborative doc', { workspaceId, collabId, currentYdocId, error })
}

const unset = update.$unset ?? {}
update.$unset = { ...unset, [attribute.name]: 1 }
}

return update
Expand Down Expand Up @@ -510,3 +517,22 @@ export const coreOperation: MigrateOperation = {
])
}
}

async function retry<T> (
retries: number,
op: () => Promise<T>
): Promise<T> {
let error: any
while (retries > 0) {
retries--
try {
return await op()
} catch (err: any) {
error = err
if (retries !== 0) {
await new Promise((resolve) => setTimeout(resolve, 50))
}
}
}
throw error
}

0 comments on commit 9cab677

Please sign in to comment.