velocious 1.0.746 → 1.0.747
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/background-jobs/store.js +18 -14
- package/build/src/background-jobs/store.d.ts.map +1 -1
- package/build/src/background-jobs/store.js +19 -19
- package/build/src/sync/sync-envelope-replay-service.d.ts.map +1 -1
- package/build/src/sync/sync-envelope-replay-service.js +9 -3
- package/build/src/sync/upsert-server-origin-sync-row.d.ts.map +1 -1
- package/build/src/sync/upsert-server-origin-sync-row.js +5 -2
- package/build/sync/sync-envelope-replay-service.js +8 -2
- package/build/sync/upsert-server-origin-sync-row.js +4 -1
- package/package.json +1 -1
- package/src/background-jobs/store.js +18 -14
- package/src/sync/sync-envelope-replay-service.js +8 -2
- package/src/sync/upsert-server-origin-sync-row.js +4 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"upsert-server-origin-sync-row.d.ts","sourceRoot":"","sources":["../../../src/sync/upsert-server-origin-sync-row.js"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,yBAAyB,CAAC,EAC9C,qBAAiD,EACjD,UAAU,EACV,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,EACT,GAAG,QAAQ,EACZ,EAdE;IAAsB,qBAAqB,AAA3C,CACA,EADQ,MAAM,CACd;IAA4D,UAAU,EAA9D,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CACrD;IAA6C,gBAAgB,AAA7D,CACA,EADQ,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,CACrC;IAAwB,gBAAgB,AAAxC,CACA,EADQ,MAAM,EAAE,CAChB;IAA4C,SAAS,EAA7C,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,CACrC;CASF,GATY,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"upsert-server-origin-sync-row.d.ts","sourceRoot":"","sources":["../../../src/sync/upsert-server-origin-sync-row.js"],"names":[],"mappings":"AASA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,yBAAyB,CAAC,EAC9C,qBAAiD,EACjD,UAAU,EACV,gBAAgB,EAChB,gBAAgB,EAChB,SAAS,EACT,GAAG,QAAQ,EACZ,EAdE;IAAsB,qBAAqB,AAA3C,CACA,EADQ,MAAM,CACd;IAA4D,UAAU,EAA9D,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CACrD;IAA6C,gBAAgB,AAA7D,CACA,EADQ,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,CACrC;IAAwB,gBAAgB,AAAxC,CACA,EADQ,MAAM,EAAE,CAChB;IAA4C,SAAS,EAA7C,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,CACrC;CASF,GATY,OAAO,CAAC,UAAU,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAuFlD"}
|
|
@@ -82,7 +82,10 @@ export async function upsertServerOriginSyncRow({ actorForeignKeyColumn = "authe
|
|
|
82
82
|
await duplicateSync.destroy();
|
|
83
83
|
}
|
|
84
84
|
return await upsertSyncRow({ attributes, existingSync, syncModel: rowModel });
|
|
85
|
-
}, {
|
|
85
|
+
}, {
|
|
86
|
+
dedicatedConnection: true,
|
|
87
|
+
holdTimeoutMs: 60_000
|
|
88
|
+
});
|
|
86
89
|
}
|
|
87
90
|
/**
|
|
88
91
|
* Validates one required string component of the server-origin identity.
|
|
@@ -125,4 +128,4 @@ function compareServerOriginSyncRowsByRecency(left, right) {
|
|
|
125
128
|
return rightSequence - leftSequence;
|
|
126
129
|
return left.id().localeCompare(right.id());
|
|
127
130
|
}
|
|
128
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"upsert-server-origin-sync-row.js","sourceRoot":"","sources":["../../../src/sync/upsert-server-origin-sync-row.js"],"names":[],"mappings":"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","sourcesContent":["// @ts-check\n\nimport restArgsError from \"../utils/rest-args-error.js\"\nimport sha256Hex from \"../utils/sha256-hex.js\"\nimport stableJsonStringify from \"../utils/stable-json.js\"\n\nimport {upsertSyncRow} from \"./sync-change-fanout.js\"\nimport {declaredSyncScopeAttributes} from \"./sync-scope-attributes.js\"\n\n/**\n * Atomically reconciles and upserts one server-origin sync row by its complete,\n * null-safe logical identity. The identity contains the null actor, resource\n * type/id, and either every scope column declared by the sync model or the\n * caller's explicit effective scope columns for a supported legacy publisher.\n * A stable portable advisory lock serializes runtime publication and maintenance/backfill calls;\n * legacy duplicates converge to the newest server sequence, then the lowest\n * immutable id, before the survivor is updated and re-sequenced.\n *\n * The lock is acquired through the static sync model on a dedicated connection.\n * `persistenceModel` may be an operation-bound model facade so reads/writes keep\n * their owning operation while sharing the same identity lock as ordinary\n * publisher calls.\n * @param {object} args - Persistence arguments.\n * @param {string} [args.actorForeignKeyColumn] - Persisted actor foreign-key column.\n * @param {Record<string, ReturnType<typeof JSON.parse>>} args.attributes - Complete sync-row mutation attributes.\n * @param {ReturnType<typeof JSON.parse>} [args.persistenceModel] - Optional operation-bound model used for row reads/writes.\n * @param {string[]} [args.scopeColumnNames] - Exact persisted scope columns overriding model declarations for a supported legacy publisher identity.\n * @param {ReturnType<typeof JSON.parse>} args.syncModel - Static sync model owning scope metadata and the advisory lock.\n * @returns {Promise<ReturnType<typeof JSON.parse>>} Created or reconciled sync row.\n */\nexport async function upsertServerOriginSyncRow({\n  actorForeignKeyColumn = \"authentication_token_id\",\n  attributes,\n  persistenceModel,\n  scopeColumnNames,\n  syncModel,\n  ...restArgs\n}) {\n  restArgsError(restArgs)\n\n  if (typeof actorForeignKeyColumn !== \"string\" || !actorForeignKeyColumn) {\n    throw new Error(\"Server-origin sync row actorForeignKeyColumn must be a non-empty string\")\n  }\n  if (!attributes || typeof attributes !== \"object\" || Array.isArray(attributes)) {\n    throw new Error(\"Server-origin sync row attributes must be a plain object\")\n  }\n  if (!Object.hasOwn(attributes, actorForeignKeyColumn) || attributes[actorForeignKeyColumn] === undefined) {\n    throw new Error(`Server-origin sync row identity must include the actor column ${actorForeignKeyColumn}`)\n  }\n  if (attributes[actorForeignKeyColumn] !== null) {\n    throw new Error(`Server-origin sync row actor column ${actorForeignKeyColumn} must be null`)\n  }\n\n  validateRequiredIdentityString({attributes, columnName: \"resource_id\"})\n  validateRequiredIdentityString({attributes, columnName: \"resource_type\"})\n\n  /** @type {Record<string, ReturnType<typeof JSON.parse>>} */\n  const identity = {\n    [actorForeignKeyColumn]: null,\n    resource_id: attributes.resource_id,\n    resource_type: attributes.resource_type\n  }\n  const attributeToColumnName = syncModel.getAttributeNameToColumnNameMap()\n  const scopeColumns = new Set(scopeColumnNames || [])\n\n  if (scopeColumnNames === undefined) {\n    for (const scopeAttribute of declaredSyncScopeAttributes(syncModel) || []) {\n      const columnName = attributeToColumnName[scopeAttribute]\n\n      if (!columnName) {\n        throw new Error(`${syncModel.name} declares the sync scope attribute ${scopeAttribute} but has no matching column for it`)\n      }\n\n      scopeColumns.add(columnName)\n    }\n  }\n\n  for (const columnName of scopeColumns) {\n    if (typeof columnName !== \"string\" || !columnName || !Object.values(attributeToColumnName).includes(columnName)) {\n      throw new Error(`Server-origin sync row received an unknown scope column: ${String(columnName)}`)\n    }\n\n    if (!Object.hasOwn(attributes, columnName) || attributes[columnName] === undefined) {\n      throw new Error(`Server-origin sync row identity must include the declared scope column ${columnName}`)\n    }\n\n    const value = attributes[columnName]\n\n    if (value !== null && typeof value !== \"string\" && (typeof value !== \"number\" || !Number.isFinite(value))) {\n      throw new Error(`Server-origin sync row scope column ${columnName} must be a string, finite number, or null`)\n    }\n\n    identity[columnName] = value\n  }\n\n  const rowModel = persistenceModel || syncModel\n\n  return await syncModel.withAdvisoryLock(serverOriginSyncRowLockName(identity), async () => {\n    const matchingSyncs = await rowModel\n      .where(identity)\n      .toArray()\n\n    matchingSyncs.sort(compareServerOriginSyncRowsByRecency)\n\n    const [existingSync, ...duplicateSyncs] = matchingSyncs\n\n    for (const duplicateSync of duplicateSyncs) {\n      await duplicateSync.destroy()\n    }\n\n    return await upsertSyncRow({attributes, existingSync, syncModel: rowModel})\n  }, {dedicatedConnection: true})\n}\n\n/**\n * Validates one required string component of the server-origin identity.\n * @param {{attributes: Record<string, ReturnType<typeof JSON.parse>>, columnName: \"resource_id\" | \"resource_type\"}} args - Attributes and required column.\n * @returns {void}\n */\nfunction validateRequiredIdentityString({attributes, columnName}) {\n  const value = attributes[columnName]\n\n  if (typeof value !== \"string\" || !value) {\n    throw new Error(`Server-origin sync row ${columnName} must be a non-empty string`)\n  }\n}\n\n/**\n * Returns the stable MySQL-safe advisory-lock name shared by every caller of a\n * complete server-origin identity. Stable JSON preserves null identity values,\n * while the truncated SHA-256 digest keeps the name under GET_LOCK's limit.\n * @param {Record<string, ReturnType<typeof JSON.parse>>} identity - Complete sync-row identity in column form.\n * @returns {string} Advisory-lock name.\n */\nfunction serverOriginSyncRowLockName(identity) {\n  const hash = sha256Hex(stableJsonStringify(identity)).slice(0, 32)\n\n  return `vsp:${hash}`\n}\n\n/**\n * Orders matching rows with the canonical deterministic survivor first:\n * newest server sequence, then lowest immutable id. A null legacy sequence is\n * older than every assigned sequence.\n * @param {ReturnType<typeof JSON.parse>} left - First matching sync row.\n * @param {ReturnType<typeof JSON.parse>} right - Second matching sync row.\n * @returns {number} Sort comparison.\n */\nfunction compareServerOriginSyncRowsByRecency(left, right) {\n  const leftSequence = left.serverSequence()\n  const rightSequence = right.serverSequence()\n\n  if (leftSequence === null && rightSequence !== null) return 1\n  if (leftSequence !== null && rightSequence === null) return -1\n  if (leftSequence !== rightSequence) return rightSequence - leftSequence\n\n  return left.id().localeCompare(right.id())\n}\n"]}
|
|
131
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"upsert-server-origin-sync-row.js","sourceRoot":"","sources":["../../../src/sync/upsert-server-origin-sync-row.js"],"names":[],"mappings":"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","sourcesContent":["// @ts-check\n\nimport restArgsError from \"../utils/rest-args-error.js\"\nimport sha256Hex from \"../utils/sha256-hex.js\"\nimport stableJsonStringify from \"../utils/stable-json.js\"\n\nimport {upsertSyncRow} from \"./sync-change-fanout.js\"\nimport {declaredSyncScopeAttributes} from \"./sync-scope-attributes.js\"\n\n/**\n * Atomically reconciles and upserts one server-origin sync row by its complete,\n * null-safe logical identity. The identity contains the null actor, resource\n * type/id, and either every scope column declared by the sync model or the\n * caller's explicit effective scope columns for a supported legacy publisher.\n * A stable portable advisory lock serializes runtime publication and maintenance/backfill calls;\n * legacy duplicates converge to the newest server sequence, then the lowest\n * immutable id, before the survivor is updated and re-sequenced.\n *\n * The lock is acquired through the static sync model on a dedicated connection.\n * `persistenceModel` may be an operation-bound model facade so reads/writes keep\n * their owning operation while sharing the same identity lock as ordinary\n * publisher calls.\n * @param {object} args - Persistence arguments.\n * @param {string} [args.actorForeignKeyColumn] - Persisted actor foreign-key column.\n * @param {Record<string, ReturnType<typeof JSON.parse>>} args.attributes - Complete sync-row mutation attributes.\n * @param {ReturnType<typeof JSON.parse>} [args.persistenceModel] - Optional operation-bound model used for row reads/writes.\n * @param {string[]} [args.scopeColumnNames] - Exact persisted scope columns overriding model declarations for a supported legacy publisher identity.\n * @param {ReturnType<typeof JSON.parse>} args.syncModel - Static sync model owning scope metadata and the advisory lock.\n * @returns {Promise<ReturnType<typeof JSON.parse>>} Created or reconciled sync row.\n */\nexport async function upsertServerOriginSyncRow({\n  actorForeignKeyColumn = \"authentication_token_id\",\n  attributes,\n  persistenceModel,\n  scopeColumnNames,\n  syncModel,\n  ...restArgs\n}) {\n  restArgsError(restArgs)\n\n  if (typeof actorForeignKeyColumn !== \"string\" || !actorForeignKeyColumn) {\n    throw new Error(\"Server-origin sync row actorForeignKeyColumn must be a non-empty string\")\n  }\n  if (!attributes || typeof attributes !== \"object\" || Array.isArray(attributes)) {\n    throw new Error(\"Server-origin sync row attributes must be a plain object\")\n  }\n  if (!Object.hasOwn(attributes, actorForeignKeyColumn) || attributes[actorForeignKeyColumn] === undefined) {\n    throw new Error(`Server-origin sync row identity must include the actor column ${actorForeignKeyColumn}`)\n  }\n  if (attributes[actorForeignKeyColumn] !== null) {\n    throw new Error(`Server-origin sync row actor column ${actorForeignKeyColumn} must be null`)\n  }\n\n  validateRequiredIdentityString({attributes, columnName: \"resource_id\"})\n  validateRequiredIdentityString({attributes, columnName: \"resource_type\"})\n\n  /** @type {Record<string, ReturnType<typeof JSON.parse>>} */\n  const identity = {\n    [actorForeignKeyColumn]: null,\n    resource_id: attributes.resource_id,\n    resource_type: attributes.resource_type\n  }\n  const attributeToColumnName = syncModel.getAttributeNameToColumnNameMap()\n  const scopeColumns = new Set(scopeColumnNames || [])\n\n  if (scopeColumnNames === undefined) {\n    for (const scopeAttribute of declaredSyncScopeAttributes(syncModel) || []) {\n      const columnName = attributeToColumnName[scopeAttribute]\n\n      if (!columnName) {\n        throw new Error(`${syncModel.name} declares the sync scope attribute ${scopeAttribute} but has no matching column for it`)\n      }\n\n      scopeColumns.add(columnName)\n    }\n  }\n\n  for (const columnName of scopeColumns) {\n    if (typeof columnName !== \"string\" || !columnName || !Object.values(attributeToColumnName).includes(columnName)) {\n      throw new Error(`Server-origin sync row received an unknown scope column: ${String(columnName)}`)\n    }\n\n    if (!Object.hasOwn(attributes, columnName) || attributes[columnName] === undefined) {\n      throw new Error(`Server-origin sync row identity must include the declared scope column ${columnName}`)\n    }\n\n    const value = attributes[columnName]\n\n    if (value !== null && typeof value !== \"string\" && (typeof value !== \"number\" || !Number.isFinite(value))) {\n      throw new Error(`Server-origin sync row scope column ${columnName} must be a string, finite number, or null`)\n    }\n\n    identity[columnName] = value\n  }\n\n  const rowModel = persistenceModel || syncModel\n\n  return await syncModel.withAdvisoryLock(serverOriginSyncRowLockName(identity), async () => {\n    const matchingSyncs = await rowModel\n      .where(identity)\n      .toArray()\n\n    matchingSyncs.sort(compareServerOriginSyncRowsByRecency)\n\n    const [existingSync, ...duplicateSyncs] = matchingSyncs\n\n    for (const duplicateSync of duplicateSyncs) {\n      await duplicateSync.destroy()\n    }\n\n    return await upsertSyncRow({attributes, existingSync, syncModel: rowModel})\n  }, {\n    dedicatedConnection: true,\n    holdTimeoutMs: 60_000\n  })\n}\n\n/**\n * Validates one required string component of the server-origin identity.\n * @param {{attributes: Record<string, ReturnType<typeof JSON.parse>>, columnName: \"resource_id\" | \"resource_type\"}} args - Attributes and required column.\n * @returns {void}\n */\nfunction validateRequiredIdentityString({attributes, columnName}) {\n  const value = attributes[columnName]\n\n  if (typeof value !== \"string\" || !value) {\n    throw new Error(`Server-origin sync row ${columnName} must be a non-empty string`)\n  }\n}\n\n/**\n * Returns the stable MySQL-safe advisory-lock name shared by every caller of a\n * complete server-origin identity. Stable JSON preserves null identity values,\n * while the truncated SHA-256 digest keeps the name under GET_LOCK's limit.\n * @param {Record<string, ReturnType<typeof JSON.parse>>} identity - Complete sync-row identity in column form.\n * @returns {string} Advisory-lock name.\n */\nfunction serverOriginSyncRowLockName(identity) {\n  const hash = sha256Hex(stableJsonStringify(identity)).slice(0, 32)\n\n  return `vsp:${hash}`\n}\n\n/**\n * Orders matching rows with the canonical deterministic survivor first:\n * newest server sequence, then lowest immutable id. A null legacy sequence is\n * older than every assigned sequence.\n * @param {ReturnType<typeof JSON.parse>} left - First matching sync row.\n * @param {ReturnType<typeof JSON.parse>} right - Second matching sync row.\n * @returns {number} Sort comparison.\n */\nfunction compareServerOriginSyncRowsByRecency(left, right) {\n  const leftSequence = left.serverSequence()\n  const rightSequence = right.serverSequence()\n\n  if (leftSequence === null && rightSequence !== null) return 1\n  if (leftSequence !== null && rightSequence === null) return -1\n  if (leftSequence !== rightSequence) return rightSequence - leftSequence\n\n  return left.id().localeCompare(right.id())\n}\n"]}
|
|
@@ -825,7 +825,10 @@ export default class SyncEnvelopeReplayService {
|
|
|
825
825
|
|
|
826
826
|
if (!this.conflictStrategy) return await runDelete()
|
|
827
827
|
|
|
828
|
-
return await ModelClass.withAdvisoryLock(syncReplayConflictLockName({resourceId: mutation.resourceId, resourceType: mutation.resourceType}), runDelete, {
|
|
828
|
+
return await ModelClass.withAdvisoryLock(syncReplayConflictLockName({resourceId: mutation.resourceId, resourceType: mutation.resourceType}), runDelete, {
|
|
829
|
+
dedicatedConnection: true,
|
|
830
|
+
holdTimeoutMs: 60_000
|
|
831
|
+
})
|
|
829
832
|
}
|
|
830
833
|
|
|
831
834
|
/**
|
|
@@ -879,7 +882,10 @@ export default class SyncEnvelopeReplayService {
|
|
|
879
882
|
|
|
880
883
|
if (!this.conflictStrategy) return await runUpsert()
|
|
881
884
|
|
|
882
|
-
return await ModelClass.withAdvisoryLock(syncReplayConflictLockName({resourceId: mutation.resourceId, resourceType: mutation.resourceType}), runUpsert, {
|
|
885
|
+
return await ModelClass.withAdvisoryLock(syncReplayConflictLockName({resourceId: mutation.resourceId, resourceType: mutation.resourceType}), runUpsert, {
|
|
886
|
+
dedicatedConnection: true,
|
|
887
|
+
holdTimeoutMs: 60_000
|
|
888
|
+
})
|
|
883
889
|
}
|
|
884
890
|
|
|
885
891
|
/**
|
|
@@ -109,7 +109,10 @@ export async function upsertServerOriginSyncRow({
|
|
|
109
109
|
}
|
|
110
110
|
|
|
111
111
|
return await upsertSyncRow({attributes, existingSync, syncModel: rowModel})
|
|
112
|
-
}, {
|
|
112
|
+
}, {
|
|
113
|
+
dedicatedConnection: true,
|
|
114
|
+
holdTimeoutMs: 60_000
|
|
115
|
+
})
|
|
113
116
|
}
|
|
114
117
|
|
|
115
118
|
/**
|
package/package.json
CHANGED
|
@@ -10,6 +10,7 @@ import BackgroundJobRecord from "./job-record.js"
|
|
|
10
10
|
import normalizeBackgroundJobError from "./normalize-error.js"
|
|
11
11
|
import {evaluateBackgroundJobOwnerLiveness, isProcessAlive} from "./owner-liveness.js"
|
|
12
12
|
import { coordinateSharedTransactionConnection } from "../testing/shared-transaction-connection-coordinator.js"
|
|
13
|
+
import AdvisoryLockRunner from "../database/advisory-lock-runner.js"
|
|
13
14
|
import stableJsonStringify from "../utils/stable-json.js"
|
|
14
15
|
import {
|
|
15
16
|
BACKGROUND_JOB_ACTIVE_STATUSES,
|
|
@@ -183,6 +184,7 @@ const MAX_JOB_TIMEOUT_MS = 2_147_483_647
|
|
|
183
184
|
const JOB_TIMEOUT_VALIDATION_MESSAGE = `background job timeoutMs must be a finite non-positive number or an integer between 1 and ${MAX_JOB_TIMEOUT_MS}`
|
|
184
185
|
const BACKGROUND_JOB_PRIORITY_VALIDATION_MESSAGE = "background job priority must be a non-negative integer"
|
|
185
186
|
const ORPHANED_AFTER_MS = 2 * 60 * 60 * 1000
|
|
187
|
+
const BACKGROUND_JOB_ADVISORY_LOCK_HOLD_TIMEOUT_MS = 60_000
|
|
186
188
|
|
|
187
189
|
/**
|
|
188
190
|
* How long a lane's oldest eligible queued row may wait before the lane counts as starved.
|
|
@@ -339,11 +341,13 @@ export default class BackgroundJobsStore extends BackgroundJobsAdapter {
|
|
|
339
341
|
await this.ensureReady()
|
|
340
342
|
|
|
341
343
|
await this._withDb(async (db) => {
|
|
342
|
-
const
|
|
343
|
-
|
|
344
|
-
|
|
344
|
+
const runner = new AdvisoryLockRunner({
|
|
345
|
+
configuration: this.configuration,
|
|
346
|
+
connectionProvider: () => db,
|
|
347
|
+
databaseIdentifier: this.getDatabaseIdentifier()
|
|
348
|
+
})
|
|
345
349
|
|
|
346
|
-
|
|
350
|
+
await runner.withAdvisoryLock(CONCURRENCY_RECONCILIATION_LOCK, async () => {
|
|
347
351
|
await this._reconcileQueueConcurrency(db)
|
|
348
352
|
await this._reconcileConcurrency(db)
|
|
349
353
|
|
|
@@ -351,9 +355,7 @@ export default class BackgroundJobsStore extends BackgroundJobsAdapter {
|
|
|
351
355
|
// fails after adoption, a retry on this store must re-enter and repair
|
|
352
356
|
// the counts (adoption itself is idempotent).
|
|
353
357
|
this._queueConcurrencyReconciled = true
|
|
354
|
-
}
|
|
355
|
-
await db.releaseAdvisoryLock(CONCURRENCY_RECONCILIATION_LOCK)
|
|
356
|
-
}
|
|
358
|
+
}, {holdTimeoutMs: BACKGROUND_JOB_ADVISORY_LOCK_HOLD_TIMEOUT_MS})
|
|
357
359
|
})
|
|
358
360
|
|
|
359
361
|
await this.logger.info(() => [
|
|
@@ -4748,16 +4750,18 @@ export default class BackgroundJobsStore extends BackgroundJobsAdapter {
|
|
|
4748
4750
|
const {advisoryLock} = options
|
|
4749
4751
|
|
|
4750
4752
|
if (advisoryLock) {
|
|
4751
|
-
const
|
|
4753
|
+
const runner = new AdvisoryLockRunner({
|
|
4754
|
+
configuration: this.configuration,
|
|
4755
|
+
connectionProvider: () => db,
|
|
4756
|
+
databaseIdentifier: this.getDatabaseIdentifier()
|
|
4757
|
+
})
|
|
4752
4758
|
|
|
4753
|
-
|
|
4759
|
+
return await runner.withAdvisoryLock(advisoryLock.name, async () => await callback(db), {
|
|
4760
|
+
holdTimeoutMs: BACKGROUND_JOB_ADVISORY_LOCK_HOLD_TIMEOUT_MS
|
|
4761
|
+
})
|
|
4754
4762
|
}
|
|
4755
4763
|
|
|
4756
|
-
|
|
4757
|
-
return await callback(db)
|
|
4758
|
-
} finally {
|
|
4759
|
-
if (advisoryLock) await db.releaseAdvisoryLock(advisoryLock.name)
|
|
4760
|
-
}
|
|
4764
|
+
return await callback(db)
|
|
4761
4765
|
})
|
|
4762
4766
|
} finally {
|
|
4763
4767
|
resolveRun()
|
|
@@ -825,7 +825,10 @@ export default class SyncEnvelopeReplayService {
|
|
|
825
825
|
|
|
826
826
|
if (!this.conflictStrategy) return await runDelete()
|
|
827
827
|
|
|
828
|
-
return await ModelClass.withAdvisoryLock(syncReplayConflictLockName({resourceId: mutation.resourceId, resourceType: mutation.resourceType}), runDelete, {
|
|
828
|
+
return await ModelClass.withAdvisoryLock(syncReplayConflictLockName({resourceId: mutation.resourceId, resourceType: mutation.resourceType}), runDelete, {
|
|
829
|
+
dedicatedConnection: true,
|
|
830
|
+
holdTimeoutMs: 60_000
|
|
831
|
+
})
|
|
829
832
|
}
|
|
830
833
|
|
|
831
834
|
/**
|
|
@@ -879,7 +882,10 @@ export default class SyncEnvelopeReplayService {
|
|
|
879
882
|
|
|
880
883
|
if (!this.conflictStrategy) return await runUpsert()
|
|
881
884
|
|
|
882
|
-
return await ModelClass.withAdvisoryLock(syncReplayConflictLockName({resourceId: mutation.resourceId, resourceType: mutation.resourceType}), runUpsert, {
|
|
885
|
+
return await ModelClass.withAdvisoryLock(syncReplayConflictLockName({resourceId: mutation.resourceId, resourceType: mutation.resourceType}), runUpsert, {
|
|
886
|
+
dedicatedConnection: true,
|
|
887
|
+
holdTimeoutMs: 60_000
|
|
888
|
+
})
|
|
883
889
|
}
|
|
884
890
|
|
|
885
891
|
/**
|
|
@@ -109,7 +109,10 @@ export async function upsertServerOriginSyncRow({
|
|
|
109
109
|
}
|
|
110
110
|
|
|
111
111
|
return await upsertSyncRow({attributes, existingSync, syncModel: rowModel})
|
|
112
|
-
}, {
|
|
112
|
+
}, {
|
|
113
|
+
dedicatedConnection: true,
|
|
114
|
+
holdTimeoutMs: 60_000
|
|
115
|
+
})
|
|
113
116
|
}
|
|
114
117
|
|
|
115
118
|
/**
|