Merge pull request #89 from epandurski/master

Use with_for_update(key_share=True)
swaptacular · Aug 14, 2024 · 58f7a10 · 58f7a10
2 parents 9921d98 + 72c6ef8
commit 58f7a10
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/swpt_debtors/procedures.py b/swpt_debtors/procedures.py
@@ -171,7 +171,7 @@ def get_debtor(
             == Debtor.STATUS_IS_ACTIVATED_FLAG
         )
     if lock:
-        query = query.with_for_update()
+        query = query.with_for_update(key_share=True)
 
     return query.one_or_none()
 
@@ -213,7 +213,7 @@ def update_debtor_config(
 
 @atomic
 def get_debtor_transfer_uuids(debtor_id: int) -> List[UUID]:
-    debtor = get_active_debtor(debtor_id, lock=True)
+    debtor = get_active_debtor(debtor_id)
     if debtor is None:
         raise DebtorDoesNotExist()
 
@@ -234,7 +234,7 @@ def get_running_transfer(
         debtor_id=debtor_id, transfer_uuid=transfer_uuid
     )
     if lock:
-        query = query.with_for_update()
+        query = query.with_for_update(key_share=True)
 
     return query.one_or_none()
 
@@ -353,7 +353,7 @@ def process_rejected_config_signal(
             func.abs(Debtor.min_balance + negligible_amount)
             <= EPS * negligible_amount
         )
-        .with_for_update()
+        .with_for_update(key_share=True)
         .one_or_none()
     )
 
@@ -374,7 +374,7 @@ def process_account_purge_signal(
             has_server_account=True,
         )
         .filter(Debtor.account_creation_date <= creation_date)
-        .with_for_update()
+        .with_for_update(key_share=True)
         .one_or_none()
     )
 

diff --git a/swpt_debtors/table_scanners.py b/swpt_debtors/table_scanners.py
@@ -141,7 +141,7 @@ def has_unreported_config_problem(row) -> bool:
                     Debtor.status_flags.op("&")(status_flags_mask)
                     == Debtor.STATUS_IS_ACTIVATED_FLAG
                 )
-                .with_for_update(skip_locked=True)
+                .with_for_update(skip_locked=True, key_share=True)
                 .all()
             )