Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

fix(upgrade): 核查差异的存量结算改在后台跑,不挡服务启动

longmeidaob31700524344
diff --git a/src/peach/upgrade_repairs.py b/src/peach/upgrade_repairs.py
index 0a4b7adc4..498027a5c 100644
--- a/src/peach/upgrade_repairs.py
+++ b/src/peach/upgrade_repairs.py
@@ -188,7 +188,6 @@ class UpgradeRepairs:
(CATALOG_REVISION, CATALOG_REVISION + ':text-*')).fetchone()
if applied is not None:
self._restore_receipt(json.loads(applied[0]))
- self._settle_verification()
return
self._restore_receipt(None)
sources = Path(contract.follow_sources_root)
@@ -228,14 +227,22 @@ class UpgradeRepairs:
connection.execute('INSERT INTO ledger_upgrade_repair(id,applied_at,result_json) VALUES(?,?,?)',
(REVISION, str(time.time()), json.dumps(receipt, ensure_ascii=False)))
atomic_write_text(self.receipt, json.dumps(receipt, ensure_ascii=False))
- self._settle_verification()
def _settle_verification(self) -> None:
"""核查差异的结算规则(ADR-0137)对存量候选跑一遍,规则版本变了才再跑。
只喂带核查标记的那些行:其余候选的判据没变,这一步不替它们重判。有要处理的行才
先备份;结果连同规则版本记进 `ledger_upgrade_repair`,账本恢复到之前的备份时会重跑。
+ 几千行要跑一两分钟,所以不在 `prepare` 里挡着服务启动,由 `start` 交给后台调度跑;
+ 自动落库按批提交,页面上的写入照常穿插进来。
"""
+ try:
+ self._settle_verification_once()
+ except Exception as exc:
+ self.error = str(exc)
+ LOGGER.exception('核查差异存量结算失败')
+
+ def _settle_verification_once(self) -> None:
from .metadata_auto_apply import _parsed_candidates, auto_apply_metadata
from .review_csv import read_candidates
key = f'verification-settlement-{upgrade_rules.VERIFICATION_SETTLEMENT}'
@@ -415,6 +422,7 @@ class UpgradeRepairs:
if self.available and not self.scheduler.running:
self.tick()
self.scheduler.add_job(self.tick, 'interval', seconds=60, max_instances=1, coalesce=True)
+ self.scheduler.add_job(self._settle_verification, max_instances=1)
self.scheduler.start()
def stop(self) -> None:
diff --git a/tests/test_upgrade_repairs.py b/tests/test_upgrade_repairs.py
index fe5300243..013762ced 100644
--- a/tests/test_upgrade_repairs.py
+++ b/tests/test_upgrade_repairs.py
@@ -149,9 +149,7 @@ class UpgradeRepairTests(unittest.TestCase):
row=connection.execute('SELECT catalog_title,field_owners FROM asset WHERE id=1').fetchone()
self.assertEqual(row[0], '元の題名')
self.assertEqual(json.loads(row[1])['catalog_title'], 'auto:dmm')
- self.assertEqual(connection.execute(
- "SELECT count(*) FROM ledger_upgrade_repair WHERE id NOT GLOB 'verification-settlement-*'"
- ).fetchone()[0], 2)
+ self.assertEqual(connection.execute('SELECT count(*) FROM ledger_upgrade_repair').fetchone()[0], 2)
self.assertEqual(connection.execute('PRAGMA integrity_check').fetchone()[0], 'ok')
self.assertEqual(len(list(self.root.glob('ledger.pre-upgrade-*.db'))), 2)
self.assertEqual(upgrade_repairs._read(self.service.receipt)['text_media_ids'], [1])
@@ -290,9 +288,7 @@ class UpgradeRepairTests(unittest.TestCase):
with self.database.read_connection() as connection:
rows = connection.execute('SELECT id,code,duration FROM asset ORDER BY id').fetchall()
self.assertEqual([tuple(row) for row in rows], [(1, 'SSIS-123', None), (2, 'BAD-001', None)])
- self.assertEqual(connection.execute(
- "SELECT count(*) FROM ledger_upgrade_repair WHERE id NOT GLOB 'verification-settlement-*'"
- ).fetchone()[0], 1)
+ self.assertEqual(connection.execute('SELECT count(*) FROM ledger_upgrade_repair').fetchone()[0], 1)
self.assertEqual(len(list(self.root.glob('ledger.pre-upgrade-*.db'))), 1)
receipt = upgrade_repairs._read(self.service.receipt)
self.assertEqual(receipt['local']['before'], receipt['local']['after'])
@@ -332,8 +328,9 @@ class UpgradeRepairTests(unittest.TestCase):
self.assertEqual(connection.execute('SELECT count(*) FROM ledger_upgrade_repair').fetchone()[0], 0)
self.assertFalse(self.service.receipt.exists())
- def test_verification_rows_already_on_disk_settle_once_after_upgrade(self):
- """升级前落盘的核查候选(ADR-0137)由升级补修结算一次,官方一致的日期写入,备份先行。"""
+ def test_verification_rows_already_on_disk_settle_once_in_the_background(self):
+ """升级前落盘的核查候选(ADR-0137)在后台结算一次,官方一致的日期写入,备份先行;
+ 启动前的 `prepare` 不等它。"""
import csv
with self.database.write_transaction() as connection:
connection.execute("INSERT INTO asset(id,location,path,name,medium,code,release_date) "
@@ -353,7 +350,11 @@ class UpgradeRepairTests(unittest.TestCase):
'field': 'release_date', 'current_value': '2024-09-06', 'status': 'candidate',
'candidates_json': json.dumps(candidates)})
self.service.prepare()
- self.service.prepare()
+ with self.database.read_connection() as connection:
+ self.assertEqual(connection.execute('SELECT release_date FROM asset WHERE id=7').fetchone()[0],
+ '2024-09-06')
+ self.service._settle_verification()
+ self.service._settle_verification()
with self.database.read_connection() as connection:
self.assertEqual(connection.execute('SELECT release_date FROM asset WHERE id=7').fetchone()[0],
'2024-09-10')