fix: reconcile historical leases and record scoped native changes

This commit is contained in:
阿白叔 committed 2026-11-06 11:21:15 +08:00
1 parent d8156c57f0
commit 8eefecd9f0
6 files changed
+188 -8

No files matched your search

@@ -0,0 +1,9 @@
# 评论 275:占用复核与变更报告
校验和管理共用历史释放记录复核:旧 JSON/内存租约触发实际进程、地址、独占文件和导出副本证明,不直接视为真实占用,不结束进程或执行 Repair。确认释放后归档旧记录并继续;失败且本项尚未启动时保留原记录,结果不会把本项标成未释放。校验结果兼容新增 release_proof,管理首次原生调用前保存释放经过;进程释放不等于历史数据已恢复。
写后仅对原先的目标 Work/Cert、中心库配置和共享依赖范围生成 SHA-256 差分,报告新增、删除、修改路径,并保存写后清单。范围沿用原有 ManifestScope.library,不增加整库备份或其他 CBB 内容哈希,不声称已证明所有其他 CBB 未被波及。已释放的部分失败也保留差分;仍有原生所有者时不为报告读取数据库。报告失败单独标为 UNCONFIRMED 并返回原因,不伪造未完成事务、不制造永久占用。
PASS 不再重复计入 unconfirmed。未改变实际原生写操作、人工备份政策或服务器保护,也没有恢复自动修复。
回归覆盖历史记录无占用/真实地址占用、首次原生调用前留证、目标及共享依赖差分、失败后差分、报告保存失败后可继续。完整回归和限制以最终验证记录及 PR 描述为准;真实 Mentor、Win10、跨机器共享库尚未因此取得新验收结论。
+1 -1
View File
@@ -21,7 +21,7 @@ def maintenance_counts(results):
'checked_without_repair': sum(r.status == 'CHECKED' for r in results),
'issues_found': sum(r.error_category == 'ICDB_REPAIR_REQUIRED' for r in results),
'in_use': sum(r.error_category == 'ICDB_DATABASE_IN_USE' for r in results),
'unconfirmed': sum(r.status not in ('CHECKED', 'SKIPPED', 'CANCELLED')
'unconfirmed': sum(r.status not in ('PASS', 'CHECKED', 'SKIPPED', 'CANCELLED')
and r.error_category not in ('ICDB_REPAIR_REQUIRED', 'ICDB_DATABASE_IN_USE') for r in results),
'cancelled': sum(r.status == 'CANCELLED' for r in results),
'skipped': sum(r.status == 'SKIPPED' for r in results),
+23 -1
View File
@@ -82,6 +82,28 @@ def has_retained_library(library):
return bool(owner and owner['retained'])
def recheck_previous_release(library, evidence_dir, *, block_name=None, required=False, progress=None):
"""Historical records trigger fresh proof, never process termination or repair."""
if not (required or has_blocker(library) or has_retained_library(library)):
return None
def notify(stage, **details):
if progress is not None:
try:
progress({'stage': stage, 'block': block_name or '', **details})
except Exception:
import logging
logging.getLogger(__name__).warning('Release progress observer failed', exc_info=True)
notify('previous_release_check', detail='正在复核历史记录对应的实际占用')
try:
proof = release_retained_library(library, evidence_dir, block_name=block_name)
except Exception as error:
notify('previous_release_unconfirmed', detail=str(error))
raise
notify('previous_release_confirmed', release_proof=proof,
detail='已确认会话释放并归档历史记录;这不表示历史数据已恢复')
return proof
def _persist_blocker(library, status='OWNER_RELEASE_UNCONFIRMED', *, lease_id, block_name=None):
import win32api, win32process
path = blocker_path(library)
@@ -499,7 +521,7 @@ def _prove_library_released(library, block_name=None, *, allow_unknown_checkpoin
def release_retained_library(library, evidence_dir, *, block_name=None):
"""Explicit user-requested release, after fresh owner/address/access proof.
"""Reconcile historical leases after fresh owner/address/access proof.
The upload sidecar is never deleted. This acknowledges process release,
not the correctness of a partially changed library or its recovery state.
+34 -5
View File
@@ -73,6 +73,7 @@ class ManagementResult:
detail: str = ''
evidence_path: Path | None = None
release_proof: dict | None = None
change_report: dict | None = None
def validate_name(value):
@@ -186,6 +187,8 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
mutex = None
acquired = False
release_proof = None
original = None
change_report = None
def invoke(callback, *args):
nonlocal owner_safe
owner_safe = False
@@ -206,8 +209,32 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
if progress:
progress({'stage': stage, 'block': request.name, 'operation': request.operation, **details})
def finish(status, detail='', safe=True):
nonlocal change_report
if mutated and original is not None and change_report is None:
change_report = {'status': 'UNCONFIRMED', 'scope': original['scope'],
'unrelated_cbb_content_checked': False,
'detail': '原生会话尚未释放,未读取写后内容'}
if safe:
try:
after = build_exclusive_library_manifest(library_root, scope=scope, progress=progress)
_write_json(root/'library-after-manifest.json', after)
before_files, after_files = original['files'], after['files']
change_report.update(status='RECORDED', detail='目标工程及共享依赖的内容差分',
added=sorted(after_files.keys()-before_files.keys()),
deleted=sorted(before_files.keys()-after_files.keys()),
modified=sorted(path for path in before_files.keys() & after_files.keys()
if before_files[path] != after_files[path]))
except Exception as error:
change_report['detail'] = f'写后内容未确认:{error}'
try:
_write_json(root/'library-changes.json', change_report)
except OSError as error:
change_report.update(status='UNCONFIRMED', evidence_error=str(error),
detail=f'变更记录保存失败:{error}')
if change_report['status'] != 'RECORDED':
detail = (detail+'\n'+change_report['detail']).strip()
result = ManagementResult(request.operation, request.library, request.name, request.partition,
request.source, request.auto_verify, 'complete', status, safe, detail, report, release_proof)
request.source, request.auto_verify, 'complete', status, safe, detail, report, release_proof, change_report)
if report:
try:
_write_json(report, {**asdict(result), 'history': history, 'backup_policy': 'manual'})
@@ -256,10 +283,12 @@ def run_management(request, *, adapter=None, verifier=None, idle_check=None, pro
acquired = win32event.WaitForSingleObject(mutex, 0) in (win32con.WAIT_OBJECT_0, win32con.WAIT_ABANDONED)
if not acquired:
return finish('BLOCKED', '已有 CBB 校验/管理/恢复任务运行;本次未启动。')
from .library_lock import has_blocker, has_retained_library, release_retained_library
if (has_blocker(library) or has_retained_library(library) or request.check_previous_release
or unfinished_target and unfinished_target.get('safe_to_continue') is not True):
release_proof = release_retained_library(library, root/'previous-release')
from .library_lock import recheck_previous_release
release_proof = recheck_previous_release(library, root/'previous-release', block_name=request.name,
required=request.check_previous_release or bool(unfinished_target
and unfinished_target.get('safe_to_continue') is not True), progress=progress)
if release_proof is not None:
checkpoint('release_check', release_proof=release_proof)
if unfinished_target:
return finish('BLOCKED', f'存在未完成/需恢复任务,禁止自动重放:{unfinished_target["evidence_path"]}')
if hasattr(adapter, 'bind_library_mapping'):
+9 -1
View File
@@ -102,6 +102,7 @@ class VerifyResult:
timings_seconds: dict[str, float] = field(default_factory=dict)
incomplete_timing_phases: tuple[str, ...] = ()
recovery_attempts: tuple[dict, ...] = ()
release_proof: dict | None = None
def resolve_importer(mentor_bin: str | None = None) -> Path:
@@ -550,6 +551,7 @@ def run_verify(request, *, progress=None, flag_reader=None, process_runner=None,
mutex = win32event.CreateMutex(None, False, r'Local\CbbRefreshVerify795')
acquired = False
library_lock = None
previous_release = None
release_confirmed = True
remaining_clients = ()
def clients_released():
@@ -566,10 +568,12 @@ def run_verify(request, *, progress=None, flag_reader=None, process_runner=None,
if request.maintenance:
from .maintenance_entry import run_icdb_check
return run_icdb_check(request, progress=progress, stop=stop)
from .library_lock import LibraryLock, LibraryBusy
from .library_lock import LibraryLock, LibraryBusy, recheck_previous_release
import pywintypes
if Path(request.lmc_file).is_file():
try:
previous_release = recheck_previous_release(request.lmc_file,
Path(request.evidence_dir)/'previous-release', block_name=request.block_name, progress=progress)
library_lock = LibraryLock(request.lmc_file, checkpoint=False,
safe_to_release=clients_released)
library_lock.__enter__()
@@ -674,6 +678,10 @@ def run_verify(request, *, progress=None, flag_reader=None, process_runner=None,
if type(pid) is int and pid > 0)
except (OSError, ValueError, KeyError):
pass
if previous_release is not None:
result = replace(result, release_proof=previous_release)
if result.evidence_path:
_write_optional_evidence(result.evidence_path, {'block_name': request.block_name, **asdict(result)})
return result
finally:
try:
+112
View File
@@ -0,0 +1,112 @@
import json
from dataclasses import replace
import pytest
from test_management import setup, execute
def test_maintenance_totals_do_not_count_pass_as_unconfirmed():
from cbb_refresh_verify.icdb_maintenance import maintenance_counts
from cbb_refresh_verify.verify_runner import VerifyResult
counts = maintenance_counts([VerifyResult('PASS'), VerifyResult('CHECKED'),
VerifyResult('FAIL'), VerifyResult('SKIPPED')])
assert counts['passed'] == 1 and counts['unconfirmed'] == 1
assert sum(counts[k] for k in ('passed', 'checked_without_repair', 'unconfirmed',
'skipped', 'cancelled', 'issues_found', 'in_use')) == counts['total']
@pytest.mark.parametrize('occupied', [False, True])
def test_verify_rechecks_history_instead_of_ignoring_or_permanently_blocking_it(tmp_path, monkeypatch, occupied):
import cbb_refresh_verify.library_lock as locks
import cbb_refresh_verify.verify_runner as runner
library = tmp_path/'library/lib.lmc'; library.parent.mkdir(); library.touch()
locks._persist_blocker(library, lease_id='a'*32, block_name='Target')
before = locks.blocker_path(library).read_bytes()
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda *_: [])
address = library.parent/'ReusableBlocksLP/Target/Work/database/cdbsvr/sAddress.adr'
if occupied:
address.parent.mkdir(parents=True); address.touch()
called = []
monkeypatch.setattr(runner, '_run_verify_serialized', lambda *a, **kw:
called.append(1) or runner.VerifyResult('PASS', library_flag='GREEN'))
events = []
result = runner.run_verify(runner.VerifyRequest(library, 'Target', tmp_path/'evidence'), progress=events.append)
if occupied:
assert not called and result.safe_to_continue
assert result.error_category == 'LIBRARY_IN_USE'
assert locks.blocker_path(library).read_bytes() == before
else:
assert called == [1] and result.status == 'PASS'
assert result.release_proof['data_recovery_confirmed'] is False
assert not locks.blocker_path(library).exists()
assert any(e['stage'] == 'previous_release_confirmed' for e in events)
def test_management_preserves_release_context_before_first_native_call(setup, monkeypatch):
import cbb_refresh_verify.library_lock as locks
request, adapter, _ = setup
locks._persist_blocker(request.library, lease_id='b'*32)
monkeypatch.setattr('cbb_refresh_verify.owner_probe.query_owners', lambda *_: [])
catalog = adapter.catalog
def inspect(library, evidence):
checkpoint = next(request.evidence_dir.glob('*/checkpoint.json'))
history = json.loads(checkpoint.read_text('utf-8'))['history']
assert any(item.get('release_proof', {}).get('data_recovery_confirmed') is False for item in history)
return catalog(library, evidence)
monkeypatch.setattr(adapter, 'catalog', inspect)
result = execute(request, adapter)
assert result.status == 'REMOVED' and result.release_proof['status'] == 'RELEASE_CONFIRMED'
def test_management_records_scoped_changes_without_hashing_unrelated_cbb(setup, monkeypatch):
from cbb_refresh_verify import scoped_manifest
request, adapter, _ = setup
root = request.library.parent
target = root/'ReusableBlocksLP/Block/Work/Block.prj'
deleted = root/'ReusableBlocksLP/Block/Work/obsolete.dat'; deleted.write_bytes(b'old')
shared = root/'SymbolLibs/shared/icdb.dat'; shared.parent.mkdir(parents=True); shared.write_bytes(b'old')
foreign = root/'ReusableBlocksLP/Other/Work/private.dat'; foreign.parent.mkdir(parents=True); foreign.write_bytes(b'other')
original_hash = scoped_manifest.hash_file
def hashed(path):
assert path != foreign, 'Post-write report must not add whole-library hashing'
return original_hash(path)
monkeypatch.setattr(scoped_manifest, 'hash_file', hashed)
remove = adapter.remove
def mutate(req, evidence):
target.write_bytes(target.read_bytes()+b'# updated\n')
deleted.unlink(); (target.parent/'created.dat').write_bytes(b'new')
shared.write_bytes(b'changed')
return remove(req, evidence)
monkeypatch.setattr(adapter, 'remove', mutate)
result = execute(request, adapter)
report = json.loads((result.evidence_path.parent/'library-changes.json').read_text('utf-8'))
assert report['status'] == 'RECORDED' and report['unrelated_cbb_content_checked'] is False
assert report['added'] == ['ReusableBlocksLP/Block/Work/created.dat']
assert report['deleted'] == ['ReusableBlocksLP/Block/Work/obsolete.dat']
assert 'SymbolLibs/shared/icdb.dat' in report['modified']
assert 'ReusableBlocksLP/Block/Work/Block.prj' in report['modified']
assert result.change_report == report
def test_failed_mutation_still_records_changes_and_release_fact(setup):
request, adapter, source = setup
adapter.fail_add = True
result = execute(replace(request, operation='update', source=source), adapter)
assert result.status == 'RECOVERY_REQUIRED' and result.safe_to_continue
assert result.change_report['status'] == 'RECORDED'
def test_change_report_storage_failure_does_not_invent_unfinished_native_write(setup, monkeypatch):
import cbb_refresh_verify.management as management
request, adapter, _ = setup
original = management._write_json
def write(path, value):
if path.name == 'library-changes.json': raise PermissionError('report disk full')
return original(path, value)
monkeypatch.setattr(management, '_write_json', write)
result = execute(request, adapter)
assert result.safe_to_continue and result.status == 'REMOVED'
assert result.change_report['status'] == 'UNCONFIRMED'
assert 'report disk full' in result.detail
assert not management.unfinished_operations(request.evidence_dir)