nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-13 09:10:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: serialize concurrent reposts with an advisory lock

Browse Source 
Wraps per-(item, warehouse) reposting in repost_future_sle with a session-level advisory lock in front of the existing for-update row locks -- an outer gate that turns lock-order deadlocks into an orderly wait. Postgres/MariaDB only; nullcontext elsewhere. Row locks still enforce correctness. Requires frappe advisory_lock.
This commit is contained in:
Mihir Kandoi
2026-07-01 14:07:40 +05:30
parent a2f8063804
commit bb184f90a7
1 changed files with 39 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
erpnext/stock/stock_ledger.py
View File

@@ -5,6 +5,7 @@ import copy
import gzip import gzip
import json import json
from collections import deque from collections import deque
from contextlib import nullcontext
import frappe import frappe
from frappe import _, bold, scrub from frappe import _, bold, scrub
@@ -261,6 +262,25 @@ def make_entry(args, allow_negative_stock=False, via_landed_cost_voucher=False):
return sle return sle
# Reposts wait this long for the per-(item, warehouse) gate before giving up. A repost of one item
# is bounded, and a QueryTimeoutError here is recoverable -- the repost job re-queues and retries.
REPOST_LOCK_TIMEOUT = 600
def repost_gate(item_code, warehouse):
"""Serialize concurrent reposts of the same (item, warehouse) with a session-level advisory lock
acquired BEFORE the inner `... for update` row locks. It is an outer gate: two reposts touching
the same item wait for each other instead of racing into a lock-order deadlock (which repost
otherwise only survives by retrying). The row locks still enforce correctness -- this only cuts
the deadlock/retry churn. Advisory locks exist on postgres + mariadb; elsewhere there is no gate."""
# hasattr keeps this a graceful opt-in: if this ERPNext deploys before frappe.db.advisory_lock
# lands (frappe#40466), fall back to no gate rather than raising a non-recoverable AttributeError
# that would permanently mark the Repost Item Valuation as Failed.
if frappe.db.db_type in ("postgres", "mariadb") and hasattr(frappe.db, "advisory_lock"):
return frappe.db.advisory_lock(f"stock_repost:{item_code}:{warehouse}", timeout=REPOST_LOCK_TIMEOUT)
return nullcontext()
def repost_future_sle( def repost_future_sle(
items_to_be_repost=None, items_to_be_repost=None,
voucher_type=None, voucher_type=None,
@@ -289,22 +309,25 @@ def repost_future_sle(
while index < len(items_to_be_repost): while index < len(items_to_be_repost):
validate_item_warehouse(items_to_be_repost[index]) validate_item_warehouse(items_to_be_repost[index])
obj = update_entries_after( item_code = items_to_be_repost[index].get("item_code")
{ warehouse = items_to_be_repost[index].get("warehouse")
"item_code": items_to_be_repost[index].get("item_code"), with repost_gate(item_code, warehouse):
"warehouse": items_to_be_repost[index].get("warehouse"), obj = update_entries_after(
"posting_date": items_to_be_repost[index].get("posting_date"), {
"posting_time": items_to_be_repost[index].get("posting_time"), "item_code": item_code,
"creation": items_to_be_repost[index].get("creation"), "warehouse": warehouse,
"current_idx": index, "posting_date": items_to_be_repost[index].get("posting_date"),
"items_to_be_repost": items_to_be_repost, "posting_time": items_to_be_repost[index].get("posting_time"),
"repost_doc": doc, "creation": items_to_be_repost[index].get("creation"),
"repost_affected_transaction": repost_affected_transaction, "current_idx": index,
"item_wh_wise_last_posted_sle": resume_item_wh_wise_last_posted_sle, "items_to_be_repost": items_to_be_repost,
}, "repost_doc": doc,
allow_negative_stock=allow_negative_stock, "repost_affected_transaction": repost_affected_transaction,
via_landed_cost_voucher=via_landed_cost_voucher, "item_wh_wise_last_posted_sle": resume_item_wh_wise_last_posted_sle,
) },
allow_negative_stock=allow_negative_stock,
via_landed_cost_voucher=via_landed_cost_voucher,
)
index += 1 index += 1