@furongjun1999/dsh-memory 0.9.6 → 0.9.8
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/README.md +150 -662
- package/codebuddy/CODEBUDDY.md +333 -204
- package/data/policy.json +38 -38
- package/docs/README.md +18 -0
- package/docs/discipline/harnesses.yaml +11 -3
- package/docs/discipline/templates/compact.txt.tmpl +20 -18
- package/docs/discipline/templates/full.md.tmpl +63 -61
- package/docs/discipline/templates/rules.mdc.tmpl +5 -3
- package/docs/discipline/templates/skill.md.tmpl +25 -23
- package/docs/discipline/templates/spec.txt.tmpl +2 -2
- package/docs/discipline/templates/zcode-user.md.tmpl +1 -1
- package/dsh/cordis.yml.example +139 -139
- package/lib/hooks.d.ts +19 -0
- package/lib/hooks.js +30 -7
- package/lib/index.js +18 -3
- package/lib/init.js +19 -4
- package/lib/lib/hook_audit.js +64 -2
- package/lib/lib/prompt_safety.js +14 -3
- package/lib/tools.d.ts +7 -0
- package/lib/tools.js +22 -1
- package/md_cg/_guard_kit.py +121 -121
- package/md_cg/anchor.py +114 -114
- package/md_cg/audit.py +15 -2
- package/md_cg/chain.py +3 -2
- package/md_cg/config_registry_guard.py +487 -487
- package/md_cg/conformance.py +747 -747
- package/md_cg/consolidate.py +1793 -1793
- package/md_cg/crypto.py +794 -794
- package/md_cg/hyperedge.py +262 -262
- package/md_cg/interface_schema.py +146 -146
- package/md_cg/lifecycle.py +426 -426
- package/md_cg/mdcos.py +12 -8
- package/md_cg/predict.py +1103 -1103
- package/md_cg/protect.py +654 -654
- package/md_cg/provenance.py +606 -606
- package/md_cg/queue_health.py +130 -130
- package/md_cg/refine.py +613 -613
- package/md_cg/retrieve.py +128 -128
- package/md_cg/revise.py +140 -140
- package/md_cg/rollback.py +657 -657
- package/md_cg/rollback_cli.py +124 -124
- package/md_cg/rotate.py +346 -346
- package/md_cg/routing.py +490 -490
- package/md_cg/self_surface.py +50 -50
- package/md_cg/semantic/canonical.py +144 -144
- package/md_cg/semantic/zh_en_atoms.py +141 -141
- package/md_cg/sources.py +1091 -1091
- package/md_cg/stg.py +3 -2
- package/md_cg/sustain.py +10 -1
- package/md_cg/test_audit_rotate_parity.py +279 -279
- package/md_cg/test_autonomy_modes.py +2013 -2013
- package/md_cg/test_cn_recall_grams.py +206 -206
- package/md_cg/test_code_kind_forbidden.py +101 -0
- package/md_cg/test_condaccept.py +156 -156
- package/md_cg/test_condgate.py +141 -141
- package/md_cg/test_heartbeat_ledger.py +9 -3
- package/md_cg/test_i50e_readside_protection.py +658 -658
- package/md_cg/test_issue111_gate_order.py +76 -76
- package/md_cg/test_issue111_scoring_contract.py +86 -86
- package/md_cg/test_issue121_calibration_bounds.py +293 -293
- package/md_cg/test_issue145_sleep_no_silent_rollback.py +167 -167
- package/md_cg/test_issue147_pack_id_escape.py +378 -378
- package/md_cg/test_issue148_merge_downgrade_leak.py +192 -192
- package/md_cg/test_issue149_accel_default_face.py +248 -248
- package/md_cg/test_issue150_empty_query_terms.py +328 -328
- package/md_cg/test_issue151_153_157_write_cache_index.py +151 -151
- package/md_cg/test_issue152_sealed_postings.py +309 -309
- package/md_cg/test_issue153b_index_generation_invalidation.py +142 -142
- package/md_cg/test_issue157b_index_remainder.py +344 -344
- package/md_cg/test_issue189_conclusion_bidirectional.py +223 -223
- package/md_cg/test_issue191_import_trust.py +382 -382
- package/md_cg/test_issue193_write_scope.py +378 -378
- package/md_cg/test_issue212_writeface_gaps.py +349 -349
- package/md_cg/test_issue214_reject_sensitivity.py +266 -266
- package/md_cg/test_issue215_condition_source_gap.py +272 -272
- package/md_cg/test_issue216_clash_routes.py +214 -214
- package/md_cg/test_issue217_slot_routes.py +248 -248
- package/md_cg/test_issue218_postcondition_value_blind.py +222 -222
- package/md_cg/test_issue258_pack_sensitivity.py +468 -468
- package/md_cg/test_issue265_coldverify_multiproc.py +438 -438
- package/md_cg/test_issue274_read_node_id_none.py +341 -341
- package/md_cg/test_issue275_layer_param.py +250 -250
- package/md_cg/test_issue277_node_id_traversal.py +384 -384
- package/md_cg/test_issue278_neg_separated_tension.py +271 -271
- package/md_cg/test_issue278_neg_window.py +294 -294
- package/md_cg/test_issue278_negative_layering.py +83 -83
- package/md_cg/test_issue284_skip_not_pass.py +291 -291
- package/md_cg/test_issue294_flywheel_sensitivity.py +573 -573
- package/md_cg/test_issue301_baseline_corpus_gate.py +245 -245
- package/md_cg/test_issue303_design_boundaries.py +262 -262
- package/md_cg/test_issue315_merge_branch_sensitivity.py +383 -383
- package/md_cg/test_issue319_tenant_unregistered_bypass.py +256 -256
- package/md_cg/test_issue321_mcp_deep_json.py +304 -304
- package/md_cg/test_issue322_node_write_lock.py +727 -727
- package/md_cg/test_issue324_write_size_fields.py +214 -214
- package/md_cg/test_issue325_audit_poison.py +229 -229
- package/md_cg/test_issue326_ingest_auto_whitelist.py +331 -331
- package/md_cg/test_issue326_key_perms.py +355 -355
- package/md_cg/test_issue326_twin_parser_parity.py +323 -323
- package/md_cg/test_issue326_vm_call_frame.py +569 -569
- package/md_cg/test_issue345_writelimit_effective_sens.py +233 -233
- package/md_cg/test_issue346_overwrite_sensitivity_gate.py +424 -424
- package/md_cg/test_issue348_insight_verify_op.py +199 -199
- package/md_cg/test_issue348_merge_rmw_lock.py +345 -345
- package/md_cg/test_issue350_casefold_collision.py +235 -235
- package/md_cg/test_issue351_ingest_root_fallback.py +201 -201
- package/md_cg/test_issue352_imgaudit.py +418 -418
- package/md_cg/test_issue352_pathsjson.py +537 -537
- package/md_cg/test_issue352_refindex.py +412 -412
- package/md_cg/test_issue352_rollback.py +604 -604
- package/md_cg/test_issue354_p2_writelimit_toctou.py +327 -327
- package/md_cg/test_issue354_rust_index_containment.py +571 -571
- package/md_cg/test_issue354_rust_wal_containment.py +606 -606
- package/md_cg/test_issue358_truncation_observable.py +247 -247
- package/md_cg/test_issue360_tidy_private_excerpt.py +195 -195
- package/md_cg/test_issue361_blindspot_not_silent_drop.py +494 -494
- package/md_cg/test_issue362_neg_condition.py +468 -468
- package/md_cg/test_issue363_lexical_idf.py +275 -275
- package/md_cg/test_issue370_readcache_assembly.py +488 -488
- package/md_cg/test_issue376_heartbeat_failed.py +293 -293
- package/md_cg/test_issue377_layer_protect_stamp.py +324 -324
- package/md_cg/test_issue378_protected_floor.py +310 -310
- package/md_cg/test_issue383_state_event_write_gate.py +462 -462
- package/md_cg/test_issue397_sens_eff_wiring.py +435 -435
- package/md_cg/test_issue398_toolface_op_parity.py +511 -511
- package/md_cg/test_issue399_hive_json_shape.py +317 -317
- package/md_cg/test_issue401_wisdom_codegen.py +295 -295
- package/md_cg/test_issue404_heal_receipt.py +389 -389
- package/md_cg/test_issue409_compact_index_completeness.py +509 -509
- package/md_cg/test_issue410_verify_demote_write.py +366 -366
- package/md_cg/test_issue411_scrub_idempotence.py +575 -575
- package/md_cg/test_issue412_discipline_producer_parity.py +311 -311
- package/md_cg/test_issue413_preimage_failclosed.py +239 -239
- package/md_cg/test_issue413_preimage_twin.py +339 -339
- package/md_cg/test_issue415_deps_gate_probe.py +357 -357
- package/md_cg/test_issue416_entry_key_subset.py +525 -525
- package/md_cg/test_issue417_twophase_merge_landed.py +423 -423
- package/md_cg/test_issue425_ingest_library_path.py +331 -331
- package/md_cg/test_issue426c_enqueue_not_silent.py +346 -346
- package/md_cg/test_issue426e_restore_overwrite_live.py +310 -310
- package/md_cg/test_issue426f_paths_gbk_failclosed.py +301 -301
- package/md_cg/test_issue427_serve_status_shape.py +191 -191
- package/md_cg/test_issue431_432_468_protect_single_point.py +322 -322
- package/md_cg/test_issue433_outlook_threshold_single_point.py +278 -278
- package/md_cg/test_issue434_435_float_gate.py +90 -90
- package/md_cg/test_issue439_sibling_sensitivity_inherit.py +448 -448
- package/md_cg/test_issue43_default_policy.py +874 -874
- package/md_cg/test_issue444_scrub_evidence_plaintext.py +281 -281
- package/md_cg/test_issue445_metacognition_ledger_gate.py +454 -454
- package/md_cg/test_issue446_453_403_verified_evidence.py +382 -382
- package/md_cg/test_issue450_sensitivity_fallback_reason.py +51 -51
- package/md_cg/test_issue450_writegate_unknown_sens.py +203 -203
- package/md_cg/test_issue451_audit_actor.py +313 -313
- package/md_cg/test_issue452_ingest_root_sensitivity.py +299 -299
- package/md_cg/test_issue463_ghost_prune_guard.py +259 -259
- package/md_cg/test_issue466_basis_registry.py +469 -469
- package/md_cg/test_issue467_identity_sensitivity_parity.py +360 -360
- package/md_cg/test_issue469_scrub_override_passthrough.py +126 -126
- package/md_cg/test_issue470_wal_event_durable.py +427 -427
- package/md_cg/test_issue471_identity_readable.py +136 -136
- package/md_cg/test_issue472_audit_chain.py +90 -90
- package/md_cg/test_issue472_prune_ledger.py +105 -105
- package/md_cg/test_issue472_rollback_degraded.py +81 -81
- package/md_cg/test_issue491_compose_sandbox.py +460 -460
- package/md_cg/test_issue498_merge_trace_stale_index.py +280 -280
- package/md_cg/test_issue511_scoreboard_bad_files.py +256 -256
- package/md_cg/test_issue521_rotate_lock_suffix.py +110 -110
- package/md_cg/test_issue524_orphan_noise_no_demote.py +88 -88
- package/md_cg/test_issue525_read_null_semantics.py +52 -52
- package/md_cg/test_issue547_append_jsonl_whitelist.py +114 -114
- package/md_cg/test_issue547_audit_durable.py +96 -96
- package/md_cg/test_issue557_r2_write_entries_size_gate.py +83 -83
- package/md_cg/test_issue559_refine_prefix.py +69 -69
- package/md_cg/test_issue562_retired_faces.py +150 -0
- package/md_cg/test_issue71_queue_backlog.py +376 -376
- package/md_cg/test_issue72_coldverify_controlled_drain.py +420 -420
- package/md_cg/test_issue82_credential_rules.py +271 -271
- package/md_cg/test_issue91_verifier_sandbox.py +314 -314
- package/md_cg/test_issue93_remember_redaction.py +282 -282
- package/md_cg/test_logref.py +1141 -1141
- package/md_cg/test_md_access_parity.py +330 -330
- package/md_cg/test_md_cg_no_hive_dep.py +139 -139
- package/md_cg/test_mutation_residue.py +119 -119
- package/md_cg/test_mutation_rollback.py +835 -835
- package/md_cg/test_n123_derive_expiry_chain.py +210 -210
- package/md_cg/test_n184_keys_concurrent_provision.py +1 -1
- package/md_cg/test_n209_verify_write_face_gates.py +466 -466
- package/md_cg/test_n62_tenant_bind_failclosed.py +200 -200
- package/md_cg/test_neg_tail_honesty.py +733 -733
- package/md_cg/test_p21_tokens.py +294 -294
- package/md_cg/test_p27_docindex.py +792 -792
- package/md_cg/test_p28_refcheck.py +1053 -1053
- package/md_cg/test_p2_six_elements.py +476 -476
- package/md_cg/test_p33_ccg_wiring.py +300 -300
- package/md_cg/test_p3_legacy_closure.py +438 -438
- package/md_cg/test_p40_refine_worklist.py +244 -244
- package/md_cg/test_p4_freshness.py +781 -781
- package/md_cg/test_p9c_dedup_hints.py +288 -288
- package/md_cg/test_policy_required_ccg.py +444 -444
- package/md_cg/test_read_scope_b27.py +2 -2
- package/md_cg/test_retr_s5.py +312 -312
- package/md_cg/test_s1_ast_judge.py +109 -109
- package/md_cg/test_security_audit_v21.py +249 -249
- package/md_cg/test_state_event_op.py +521 -521
- package/md_cg/test_stgidx_index_parity.py +1024 -1024
- package/md_cg/test_sustain_bad_stamp.py +178 -0
- package/md_cg/test_sustain_bounded.py +652 -652
- package/md_cg/test_trust_edge_reachability.py +405 -405
- package/md_cg/test_w7_redlines.py +659 -659
- package/md_cg/test_write_return_shape.py +919 -919
- package/md_cg/test_writepipe.py +228 -228
- package/md_cg/trust.py +1114 -1114
- package/md_cg/twophase.py +303 -303
- package/md_cg/whitebox.py +536 -536
- package/md_cg/whitebox_kb/wisdom/compose_engine.py +1634 -1634
- package/md_cg/whitebox_kb/wisdom/core/condition_vm.py +318 -318
- package/md_cg/whitebox_kb/wisdom/core/parser.py +1082 -1082
- package/md_cg/whitebox_kb/wisdom/md_access.py +490 -490
- package/md_cg/whitebox_kb/wisdom/migrate_wisdom.py +497 -497
- package/md_cg/whitebox_kb/wisdom/mini_python.py +995 -995
- package/md_cg/whitebox_kb/wisdom/net_units.py +2900 -2900
- package/md_cg/whitebox_kb/wisdom/semantic_translate.py +4060 -4060
- package/md_cg/writepipe.py +1337 -1337
- package/package.json +3 -2
- package/scripts/workspace_index.py +328 -0
- package/src/hooks.ts +932 -908
- package/src/index.ts +21 -6
- package/src/init.ts +16 -4
- package/src/lib/hook_audit.ts +48 -2
- package/src/lib/mdcg_client.ts +469 -469
- package/src/lib/prompt_safety.ts +17 -3
- package/src/tools.ts +23 -1
- package/zcode/AGENTS.md +333 -204
|
@@ -1,438 +1,438 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
"""冷路径队列跨实例丢条目守卫(issue #265)。
|
|
3
|
-
|
|
4
|
-
【守什么】
|
|
5
|
-
#265 报:多实例共用同一记忆库根时 `_coldverify.jsonl` **静默丢条目**——
|
|
6
|
-
后落盘者把先落盘者刚写的任务整段抹掉,两边都 rc=0、都报成功。
|
|
7
|
-
|
|
8
|
-
复核**成立**(实测读数与报告逐字一致):
|
|
9
|
-
两进程各自入队 → `DISK disk_lines=1 node_ids=['liveA']`;
|
|
10
|
-
同进程两实例 → `IN_PROCESS disk_lines=1 node_ids=['nodeB']`。
|
|
11
|
-
|
|
12
|
-
病灶:`_persist()` 是**全量覆写**(写的是「本实例内存的快照」),`enqueue` 在
|
|
13
|
-
**进程内** `threading.Lock` 下 append 后直接调它 ⇒ 跨实例没有任何互斥或合并。
|
|
14
|
-
生产可达:`attach(cg)` 给**每个 cg 实例**各建一个队列,而
|
|
15
|
-
`writepipe._after_trust` 每次写入都 enqueue。
|
|
16
|
-
|
|
17
|
-
修法(报告建议 1/2/3,代价见 S8):
|
|
18
|
-
① `enqueue` 走 `_append_persisted`——**追加**,物理上抹不掉别人的条目;
|
|
19
|
-
② `drain` 走 `_drop_persisted`——FileLock + atomic_write 读改写,**只删
|
|
20
|
-
自己消费的**(Counter 按 (node_id, action, enqueued_at) 逐条扣减);
|
|
21
|
-
③ 半截行:追加前用 `ends_mid_line` 补换行;`_load_persisted` 改**逐行容错**
|
|
22
|
-
(改前 json 异常由包住整个循环的 except 捕获 ⇒ 一行坏、整份都不恢复)。
|
|
23
|
-
|
|
24
|
-
判据:
|
|
25
|
-
S1 结构:enqueue 走追加、drain 走「只删自己消费的」;_persist 不再被二者调用。
|
|
26
|
-
S2 ★ 两进程(真并发、同根)各自入队 ⇒ 盘上 **2** 条(报告的核心读数)。
|
|
27
|
-
S3 同进程两实例 ⇒ 盘上 **2** 条。
|
|
28
|
-
S4 drain 只删自己消费的:他实例未消费的条目**留在盘上**。
|
|
29
|
-
S5 半截行:整份队列仍恢复(改前 0 条),且后续追加不与之粘连。
|
|
30
|
-
S6 反陈化:三处理由在源码里(#265 / 追加抹不掉别人 / 只删自己消费的)。
|
|
31
|
-
S7 修复前原形:git log -S 定位引入提交取父版本;**未提交时回落 HEAD**
|
|
32
|
-
(不假设 HEAD 处于某历史状态——项目方在 #277 踩过该坑)。
|
|
33
|
-
S8 代价不退化:300 次入队中位 < 5ms/次(报告要求「同量级」;实测改前
|
|
34
|
-
0.407ms、改后 0.189ms——全量覆写是 O(队列长度),追加是 O(1))。
|
|
35
|
-
S9 既有语义不破:clear() 仍清空;加载白名单仍拒非法 action 并计 skipped;
|
|
36
|
-
**dry_run 逐字节不动盘**(#72 的 G2 判据)。
|
|
37
|
-
S10 墓碑:`_done` 条目加载时跳过(既有语义,S4 的读改写也据此清理)。
|
|
38
|
-
|
|
39
|
-
运行:python -X utf8 -m md_cg.test_issue265_coldverify_multiproc
|
|
40
|
-
python -X utf8 -m md_cg.test_issue265_coldverify_multiproc --mutate
|
|
41
|
-
"""
|
|
42
|
-
from __future__ import annotations
|
|
43
|
-
|
|
44
|
-
import io
|
|
45
|
-
import json
|
|
46
|
-
import os
|
|
47
|
-
import statistics
|
|
48
|
-
import subprocess
|
|
49
|
-
import sys
|
|
50
|
-
import tempfile
|
|
51
|
-
import textwrap
|
|
52
|
-
import time
|
|
53
|
-
|
|
54
|
-
_TMP = tempfile.mkdtemp(prefix="i265g_")
|
|
55
|
-
# ★ 目录名不可用 "aux"——AUX 是 Windows 保留设备名(#245 实测踩到)。
|
|
56
|
-
os.environ["MDCG_AUX_ROOT"] = os.path.join(_TMP, "auxstore")
|
|
57
|
-
os.makedirs(os.environ["MDCG_AUX_ROOT"], exist_ok=True)
|
|
58
|
-
|
|
59
|
-
_REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
60
|
-
if _REPO not in sys.path:
|
|
61
|
-
sys.path.insert(0, _REPO)
|
|
62
|
-
|
|
63
|
-
if hasattr(sys.stdout, "reconfigure"):
|
|
64
|
-
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
65
|
-
|
|
66
|
-
from md_cg import coldverify as CV # noqa: E402
|
|
67
|
-
from md_cg.fsutil import read_jsonl # noqa: E402
|
|
68
|
-
|
|
69
|
-
_OK = 0
|
|
70
|
-
_BAD = []
|
|
71
|
-
_N = [0]
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
def _check(name, cond, detail=""):
|
|
75
|
-
global _OK
|
|
76
|
-
if cond:
|
|
77
|
-
_OK += 1
|
|
78
|
-
print(" ok %s" % name)
|
|
79
|
-
else:
|
|
80
|
-
_BAD.append(name)
|
|
81
|
-
print(" FAIL %s %s" % (name, detail))
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
def _root():
|
|
85
|
-
_N[0] += 1
|
|
86
|
-
r = os.path.join(_TMP, "r%d" % _N[0])
|
|
87
|
-
os.makedirs(r, exist_ok=True)
|
|
88
|
-
return r
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
def _qpath(root):
|
|
92
|
-
return os.path.join(root, CV.QUEUE_FILE)
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
def _tasks(root):
|
|
96
|
-
p = _qpath(root)
|
|
97
|
-
return list(read_jsonl(p)) if os.path.exists(p) else []
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
def _ids(root):
|
|
101
|
-
return sorted(t.get("node_id") for t in _tasks(root))
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
class _NoCG:
|
|
105
|
-
"""drain 的 cg 替身:get() 恒 None ⇒ reverify 走 node_not_found 分支,
|
|
106
|
-
不碰真库(本件只关心**落盘**,不关心验证结论)。"""
|
|
107
|
-
|
|
108
|
-
def get(self, nid):
|
|
109
|
-
return None
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
def _src(rel):
|
|
113
|
-
return io.open(os.path.join(_REPO, rel), encoding="utf-8",
|
|
114
|
-
errors="replace").read()
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
def _cold_body(name):
|
|
118
|
-
src = _src(os.path.join("md_cg", "coldverify.py"))
|
|
119
|
-
i0 = src.index(" def %s(" % name)
|
|
120
|
-
nxt = src.find("\n def ", i0 + 10)
|
|
121
|
-
return src[i0:nxt if nxt > 0 else len(src)]
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
def s1():
|
|
125
|
-
print("== S1 结构:追加 + 只删自己消费的 ==")
|
|
126
|
-
enq = _cold_body("enqueue")
|
|
127
|
-
dr = _cold_body("drain")
|
|
128
|
-
_check("S1a enqueue 走 _append_persisted", "_append_persisted(task)" in enq)
|
|
129
|
-
_check("S1b enqueue **不再**走 _persist(全量覆写)",
|
|
130
|
-
"_persist()" not in enq, enq[-200:])
|
|
131
|
-
_check("S1c drain 走 _drop_persisted", "_drop_persisted(batch)" in dr)
|
|
132
|
-
_check("S1d drain **不再**走 _persist", "_persist()" not in dr)
|
|
133
|
-
_check("S1e _append_persisted 用 O_APPEND 追加",
|
|
134
|
-
"os.O_APPEND" in _cold_body("_append_persisted"))
|
|
135
|
-
_check("S1f _drop_persisted 用 FileLock(strict=True) + atomic_write",
|
|
136
|
-
"strict=True" in _cold_body("_drop_persisted")
|
|
137
|
-
and "_atomic_write" in _cold_body("_drop_persisted"))
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
def _child_script():
|
|
141
|
-
p = os.path.join(_TMP, "child.py")
|
|
142
|
-
if not os.path.exists(p):
|
|
143
|
-
with io.open(p, "w", encoding="utf-8") as f:
|
|
144
|
-
f.write(textwrap.dedent('''
|
|
145
|
-
import os, sys, time
|
|
146
|
-
sys.path.insert(0, r"%s")
|
|
147
|
-
from md_cg.coldverify import ColdVerifyQueue
|
|
148
|
-
tag, root, tmp = sys.argv[1], sys.argv[2], sys.argv[3]
|
|
149
|
-
q = ColdVerifyQueue(root=root)
|
|
150
|
-
open(os.path.join(tmp, "ready_" + tag), "w").write("1")
|
|
151
|
-
while not (os.path.exists(os.path.join(tmp, "ready_liveA"))
|
|
152
|
-
and os.path.exists(os.path.join(tmp, "ready_liveB"))):
|
|
153
|
-
time.sleep(0.02)
|
|
154
|
-
q.enqueue(tag, action="reverify")
|
|
155
|
-
''') % _REPO)
|
|
156
|
-
return p
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
def s2():
|
|
160
|
-
print("== S2 ★ 两进程(真并发、同根)各自入队 ==")
|
|
161
|
-
root = _root()
|
|
162
|
-
child = _child_script()
|
|
163
|
-
try:
|
|
164
|
-
procs = [subprocess.Popen(
|
|
165
|
-
[sys.executable, "-X", "utf8", child, t, root, _TMP],
|
|
166
|
-
stdout=subprocess.PIPE, stderr=subprocess.PIPE) for t in
|
|
167
|
-
("liveA", "liveB")]
|
|
168
|
-
for pr in procs:
|
|
169
|
-
pr.communicate(timeout=180)
|
|
170
|
-
except Exception as exc: # noqa: BLE001
|
|
171
|
-
_check("S2 起子进程失败:%s" % exc, False)
|
|
172
|
-
return
|
|
173
|
-
got = _ids(root)
|
|
174
|
-
_check("S2a 盘上 **2** 条(改前=1,后写者抹掉先写者)", len(got) == 2, got)
|
|
175
|
-
_check("S2b 两条分别是 liveA 与 liveB", got == ["liveA", "liveB"], got)
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
def s3():
|
|
179
|
-
print("== S3 同进程两实例(各自先构造再各自入队)==")
|
|
180
|
-
root = _root()
|
|
181
|
-
q1 = CV.ColdVerifyQueue(root=root)
|
|
182
|
-
q2 = CV.ColdVerifyQueue(root=root)
|
|
183
|
-
q1.enqueue("nodeA", action="reverify")
|
|
184
|
-
q2.enqueue("nodeB", action="reverify")
|
|
185
|
-
got = _ids(root)
|
|
186
|
-
_check("S3a 盘上 **2** 条(改前=1)", len(got) == 2, got)
|
|
187
|
-
_check("S3b 两实例内存各 1 条(内存面本就独立)",
|
|
188
|
-
len(q1._queue) == 1 and len(q2._queue) == 1)
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
def s4():
|
|
192
|
-
print("== S4 drain 只删自己消费的 ==")
|
|
193
|
-
root = _root()
|
|
194
|
-
qa = CV.ColdVerifyQueue(root=root)
|
|
195
|
-
qb = CV.ColdVerifyQueue(root=root)
|
|
196
|
-
qb.enqueue("consume_me_A", action="reverify") # 盘:[consume_me_A]
|
|
197
|
-
qa.enqueue("keep_me_B", action="reverify") # 盘:[consume_me_A, keep_me_B]
|
|
198
|
-
_check("S4-pre 盘上两条都在(追加生效)",
|
|
199
|
-
_ids(root) == ["consume_me_A", "keep_me_B"], _ids(root))
|
|
200
|
-
# qc 加载盘面后**只消费其中一条**(模拟「本实例消费,他实例那条还没被消费」)
|
|
201
|
-
qc = CV.ColdVerifyQueue(root=root)
|
|
202
|
-
qc._queue = type(qc._queue)(
|
|
203
|
-
[t for t in qc._queue if t["node_id"] == "consume_me_A"])
|
|
204
|
-
_check("S4-pre2 qc 只认 consume_me_A",
|
|
205
|
-
[x["node_id"] for x in qc._queue] == ["consume_me_A"])
|
|
206
|
-
qc.drain(_NoCG())
|
|
207
|
-
got = _ids(root)
|
|
208
|
-
_check("S4a 自己消费的已从盘上摘除", "consume_me_A" not in got, got)
|
|
209
|
-
_check("S4b ★ 他实例未消费的条目**留在盘上**", "keep_me_B" in got, got)
|
|
210
|
-
_check("S4c 盘上恰 1 条", len(got) == 1, got)
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
def s5():
|
|
214
|
-
print("== S5 半截行:整份队列仍恢复,且后续追加不粘连 ==")
|
|
215
|
-
root = _root()
|
|
216
|
-
qf = _qpath(root)
|
|
217
|
-
with io.open(qf, "w", encoding="utf-8") as f:
|
|
218
|
-
f.write(json.dumps({"node_id": "ok1", "action": "reverify"}) + "\n")
|
|
219
|
-
f.write(json.dumps({"node_id": "ok2", "action": "reverify"}) + "\n")
|
|
220
|
-
f.write('{"node_id": "half", "act') # 上一个写者被杀在中途
|
|
221
|
-
q = CV.ColdVerifyQueue(root=root)
|
|
222
|
-
_check("S5a ★ 半截行不阻断整份恢复(改前=0 条)",
|
|
223
|
-
q.status()["queue_size"] == 2, q.status()["queue_size"])
|
|
224
|
-
q.enqueue("after_half", action="reverify")
|
|
225
|
-
got = _ids(root)
|
|
226
|
-
_check("S5b 追加的新条目可读(未粘在半截行上)", "after_half" in got, got)
|
|
227
|
-
_check("S5c 两行好条目仍在", {"ok1", "ok2"} <= set(got), got)
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
def s6():
|
|
231
|
-
print("== S6 反陈化:三处理由在源码里 ==")
|
|
232
|
-
src = _src(os.path.join("md_cg", "coldverify.py"))
|
|
233
|
-
_check("S6a 标注 issue #265", "issue #265" in src)
|
|
234
|
-
_check("S6b 写明「追加在物理上抹不掉别人的条目」",
|
|
235
|
-
"抹不掉" in src)
|
|
236
|
-
_check("S6c 写明「只删自己消费的」", "只删自己消费的" in src
|
|
237
|
-
or "只删自己消费" in src)
|
|
238
|
-
_check("S6d 写明半截行/整份不恢复的旧病象",
|
|
239
|
-
"整份队列都不恢复" in src)
|
|
240
|
-
_check("S6e 写明跨进程 FileLock 的必要性(与读改写互斥)",
|
|
241
|
-
"读改写" in src)
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
def _prepatch_src():
|
|
245
|
-
def _g(*a):
|
|
246
|
-
return subprocess.run(list(a), cwd=_REPO, capture_output=True,
|
|
247
|
-
text=True, encoding="utf-8", errors="replace",
|
|
248
|
-
timeout=60)
|
|
249
|
-
lg = _g("git", "log", "-S_append_persisted", "--format=%H", "--",
|
|
250
|
-
"md_cg/coldverify.py")
|
|
251
|
-
if lg.returncode == 0:
|
|
252
|
-
shas = [x.strip() for x in (lg.stdout or "").splitlines() if x.strip()]
|
|
253
|
-
if shas:
|
|
254
|
-
s = _g("git", "show", shas[-1] + "^:md_cg/coldverify.py")
|
|
255
|
-
if s.returncode == 0:
|
|
256
|
-
return s.stdout, "引入提交 %s 的父版本" % shas[-1][:8]
|
|
257
|
-
s = _g("git", "show", "HEAD:md_cg/coldverify.py")
|
|
258
|
-
if s.returncode != 0:
|
|
259
|
-
return None, "git show HEAD rc=%s" % s.returncode
|
|
260
|
-
return s.stdout, "HEAD(本改动尚未提交)"
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
def s7():
|
|
264
|
-
print("== S7 修复前原形(提交前/后都稳定)==")
|
|
265
|
-
t, how = _prepatch_src()
|
|
266
|
-
if t is None:
|
|
267
|
-
_check("S7 取修复前源失败:%s" % how, False)
|
|
268
|
-
return
|
|
269
|
-
print(" (修复前源取自 %s)" % how)
|
|
270
|
-
_check("S7a 修复前无 _append_persisted", "_append_persisted" not in t)
|
|
271
|
-
_check("S7b 修复前无 _drop_persisted", "_drop_persisted" not in t)
|
|
272
|
-
_check("S7c ★ 修复前的 _persist 确是「全量覆写」原形",
|
|
273
|
-
"持久化当前队列(全量覆写)" in t)
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
def s8():
|
|
277
|
-
print("== S8 代价不退化(报告要求「同量级」)==")
|
|
278
|
-
root = _root()
|
|
279
|
-
q = CV.ColdVerifyQueue(root=root)
|
|
280
|
-
n = 300
|
|
281
|
-
ts = []
|
|
282
|
-
for i in range(n):
|
|
283
|
-
t0 = time.perf_counter()
|
|
284
|
-
q.enqueue("n%d" % i, action="reverify")
|
|
285
|
-
ts.append((time.perf_counter() - t0) * 1000.0)
|
|
286
|
-
med = statistics.median(ts)
|
|
287
|
-
first = statistics.median(ts[:50])
|
|
288
|
-
last = statistics.median(ts[-50:])
|
|
289
|
-
print(" 中位=%.3fms 首50=%.3fms 末50=%.3fms(改前实测中位 0.407ms)"
|
|
290
|
-
% (med, first, last))
|
|
291
|
-
_check("S8a 入队中位 < 5ms/次(宽裕上界,防退化)", med < 5.0, med)
|
|
292
|
-
# 追加是 O(1):末段不得显著慢于首段(全量覆写会随队列增长而变慢)
|
|
293
|
-
_check("S8b 追加是 O(1):末 50 次 ≤ 首 50 次的 3 倍",
|
|
294
|
-
last <= max(first * 3.0, 1.0), (first, last))
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
def s9():
|
|
298
|
-
print("== S9 既有语义不破 ==")
|
|
299
|
-
root = _root()
|
|
300
|
-
q = CV.ColdVerifyQueue(root=root)
|
|
301
|
-
q.enqueue("mem_crash_test", action="reverify")
|
|
302
|
-
q2 = CV.ColdVerifyQueue(root=root)
|
|
303
|
-
_check("S9a 崩溃恢复:新实例恢复未处理任务",
|
|
304
|
-
q2.status()["queue_size"] >= 1)
|
|
305
|
-
q2.clear()
|
|
306
|
-
_check("S9b clear() 仍清空队列文件", _tasks(root) == [], _tasks(root))
|
|
307
|
-
|
|
308
|
-
# 加载白名单(v15-1):非法 action 拒收并计 skipped
|
|
309
|
-
root2 = _root()
|
|
310
|
-
with io.open(_qpath(root2), "w", encoding="utf-8") as f:
|
|
311
|
-
f.write(json.dumps({"node_id": "bad", "action": "rm_rf"}) + "\n")
|
|
312
|
-
f.write(json.dumps({"node_id": "good", "action": "reverify"}) + "\n")
|
|
313
|
-
q3 = CV.ColdVerifyQueue(root=root2)
|
|
314
|
-
_check("S9c 加载路径只收合法 action", q3.status()["queue_size"] == 1,
|
|
315
|
-
q3.status()["queue_size"])
|
|
316
|
-
_check("S9d 非法 action 计入 skipped(可审计)",
|
|
317
|
-
q3.status()["stats"]["skipped"] >= 1)
|
|
318
|
-
|
|
319
|
-
# #72 的 G2:dry_run 逐字节不动盘
|
|
320
|
-
root3 = _root()
|
|
321
|
-
q4 = CV.ColdVerifyQueue(root=root3)
|
|
322
|
-
q4.enqueue("d1", action="reverify")
|
|
323
|
-
before = io.open(_qpath(root3), "rb").read()
|
|
324
|
-
q4.drain(_NoCG(), dry_run=True)
|
|
325
|
-
after = io.open(_qpath(root3), "rb").read()
|
|
326
|
-
_check("S9e ★ dry_run 前后队列文件**逐字节不变**(#72 G2)",
|
|
327
|
-
before == after)
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
def s10():
|
|
331
|
-
print("== S10 墓碑:_done 条目加载时跳过 ==")
|
|
332
|
-
root = _root()
|
|
333
|
-
with io.open(_qpath(root), "w", encoding="utf-8") as f:
|
|
334
|
-
f.write(json.dumps({"node_id": "done1", "action": "reverify",
|
|
335
|
-
"_done": True}) + "\n")
|
|
336
|
-
f.write(json.dumps({"node_id": "live1", "action": "reverify"}) + "\n")
|
|
337
|
-
q = CV.ColdVerifyQueue(root=root)
|
|
338
|
-
_check("S10a _done 条目不恢复", q.status()["queue_size"] == 1,
|
|
339
|
-
q.status()["queue_size"])
|
|
340
|
-
_check("S10b 未消费条目照常恢复",
|
|
341
|
-
[t.get("node_id") for t in q._queue] == ["live1"])
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
_GROUPS = (s1, s2, s3, s4, s5, s6, s7, s8, s9, s10)
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
def _run_groups():
|
|
348
|
-
global _OK
|
|
349
|
-
_OK = 0
|
|
350
|
-
_BAD.clear()
|
|
351
|
-
for g in _GROUPS:
|
|
352
|
-
try:
|
|
353
|
-
g()
|
|
354
|
-
except Exception as exc: # noqa: BLE001
|
|
355
|
-
_check("断言组 %s 抛异常:%s" % (g.__name__, exc), False)
|
|
356
|
-
import traceback
|
|
357
|
-
print(traceback.format_exc()[-600:])
|
|
358
|
-
return len(_BAD)
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
def main():
|
|
362
|
-
n = _run_groups()
|
|
363
|
-
print()
|
|
364
|
-
print("冷路径跨实例守卫:%d 通过,%d 失败" % (_OK, n))
|
|
365
|
-
return 1 if n else 0
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
_MUTATIONS = (
|
|
369
|
-
("V1 enqueue 回到全量覆写(本件病象)",
|
|
370
|
-
" self._append_persisted(task)\n",
|
|
371
|
-
" self._persist()\n", "S2"),
|
|
372
|
-
("V2 drain 回到全量覆写(抹掉他实例的条目)",
|
|
373
|
-
" self._drop_persisted(batch)\n",
|
|
374
|
-
" with self._lock:\n self._persist()\n", "S4"),
|
|
375
|
-
("V3 追加前不补换行(半截行粘连)",
|
|
376
|
-
' if _ends_mid_line(self._queue_path):\n line = "\\n" + line\n',
|
|
377
|
-
"", "S5"),
|
|
378
|
-
)
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
def _reload():
|
|
382
|
-
import importlib
|
|
383
|
-
from md_cg import coldverify as _c
|
|
384
|
-
importlib.reload(_c)
|
|
385
|
-
globals()["CV"] = _c
|
|
386
|
-
|
|
387
|
-
|
|
388
|
-
def _mutate():
|
|
389
|
-
bad = []
|
|
390
|
-
p = os.path.join(_REPO, "md_cg", "coldverify.py")
|
|
391
|
-
with io.open(p, encoding="utf-8", newline="") as f:
|
|
392
|
-
pristine = f.read()
|
|
393
|
-
if "_append_persisted" not in pristine:
|
|
394
|
-
print(" SOURCE-ALREADY-MUTATED:coldverify.py 缺 _append_persisted")
|
|
395
|
-
return 1
|
|
396
|
-
for name, anchor, repl, want in _MUTATIONS:
|
|
397
|
-
with io.open(p, encoding="utf-8", newline="") as f:
|
|
398
|
-
orig = f.read()
|
|
399
|
-
NL = "\r\n" if "\r\n" in orig else "\n"
|
|
400
|
-
a_ = anchor.replace("\n", NL)
|
|
401
|
-
r_ = repl.replace("\n", NL)
|
|
402
|
-
try:
|
|
403
|
-
if a_ not in orig:
|
|
404
|
-
print(" ANCHOR-MISS %s" % name)
|
|
405
|
-
bad.append(name)
|
|
406
|
-
continue
|
|
407
|
-
with io.open(p, "w", encoding="utf-8", newline="") as f:
|
|
408
|
-
f.write(orig.replace(a_, r_, 1))
|
|
409
|
-
_reload()
|
|
410
|
-
_run_groups()
|
|
411
|
-
reds = list(_BAD)
|
|
412
|
-
hit = any(x.startswith(want) for x in reds)
|
|
413
|
-
print(" %-4s %-48s 红项=%-3d 命中%s=%s"
|
|
414
|
-
% ("OK" if hit else "BAD", name, len(reds), want,
|
|
415
|
-
"是" if hit else "否"))
|
|
416
|
-
if not hit:
|
|
417
|
-
bad.append(name)
|
|
418
|
-
finally:
|
|
419
|
-
with io.open(p, "w", encoding="utf-8", newline="") as f:
|
|
420
|
-
f.write(pristine)
|
|
421
|
-
with io.open(p, encoding="utf-8", newline="") as f:
|
|
422
|
-
if f.read() != pristine:
|
|
423
|
-
print(" RESTORE-FAILED %s" % name)
|
|
424
|
-
bad.append(name + "(恢复失败)")
|
|
425
|
-
_reload()
|
|
426
|
-
if bad:
|
|
427
|
-
print()
|
|
428
|
-
print("定点变异自证:FAIL -- %s" % "、".join(bad))
|
|
429
|
-
return 1
|
|
430
|
-
print()
|
|
431
|
-
print("定点变异自证:PASS(每处判据都被打红)")
|
|
432
|
-
return 0
|
|
433
|
-
|
|
434
|
-
|
|
435
|
-
if __name__ == "__main__":
|
|
436
|
-
if "--mutate" in sys.argv:
|
|
437
|
-
sys.exit(_mutate())
|
|
438
|
-
sys.exit(main())
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
"""冷路径队列跨实例丢条目守卫(issue #265)。
|
|
3
|
+
|
|
4
|
+
【守什么】
|
|
5
|
+
#265 报:多实例共用同一记忆库根时 `_coldverify.jsonl` **静默丢条目**——
|
|
6
|
+
后落盘者把先落盘者刚写的任务整段抹掉,两边都 rc=0、都报成功。
|
|
7
|
+
|
|
8
|
+
复核**成立**(实测读数与报告逐字一致):
|
|
9
|
+
两进程各自入队 → `DISK disk_lines=1 node_ids=['liveA']`;
|
|
10
|
+
同进程两实例 → `IN_PROCESS disk_lines=1 node_ids=['nodeB']`。
|
|
11
|
+
|
|
12
|
+
病灶:`_persist()` 是**全量覆写**(写的是「本实例内存的快照」),`enqueue` 在
|
|
13
|
+
**进程内** `threading.Lock` 下 append 后直接调它 ⇒ 跨实例没有任何互斥或合并。
|
|
14
|
+
生产可达:`attach(cg)` 给**每个 cg 实例**各建一个队列,而
|
|
15
|
+
`writepipe._after_trust` 每次写入都 enqueue。
|
|
16
|
+
|
|
17
|
+
修法(报告建议 1/2/3,代价见 S8):
|
|
18
|
+
① `enqueue` 走 `_append_persisted`——**追加**,物理上抹不掉别人的条目;
|
|
19
|
+
② `drain` 走 `_drop_persisted`——FileLock + atomic_write 读改写,**只删
|
|
20
|
+
自己消费的**(Counter 按 (node_id, action, enqueued_at) 逐条扣减);
|
|
21
|
+
③ 半截行:追加前用 `ends_mid_line` 补换行;`_load_persisted` 改**逐行容错**
|
|
22
|
+
(改前 json 异常由包住整个循环的 except 捕获 ⇒ 一行坏、整份都不恢复)。
|
|
23
|
+
|
|
24
|
+
判据:
|
|
25
|
+
S1 结构:enqueue 走追加、drain 走「只删自己消费的」;_persist 不再被二者调用。
|
|
26
|
+
S2 ★ 两进程(真并发、同根)各自入队 ⇒ 盘上 **2** 条(报告的核心读数)。
|
|
27
|
+
S3 同进程两实例 ⇒ 盘上 **2** 条。
|
|
28
|
+
S4 drain 只删自己消费的:他实例未消费的条目**留在盘上**。
|
|
29
|
+
S5 半截行:整份队列仍恢复(改前 0 条),且后续追加不与之粘连。
|
|
30
|
+
S6 反陈化:三处理由在源码里(#265 / 追加抹不掉别人 / 只删自己消费的)。
|
|
31
|
+
S7 修复前原形:git log -S 定位引入提交取父版本;**未提交时回落 HEAD**
|
|
32
|
+
(不假设 HEAD 处于某历史状态——项目方在 #277 踩过该坑)。
|
|
33
|
+
S8 代价不退化:300 次入队中位 < 5ms/次(报告要求「同量级」;实测改前
|
|
34
|
+
0.407ms、改后 0.189ms——全量覆写是 O(队列长度),追加是 O(1))。
|
|
35
|
+
S9 既有语义不破:clear() 仍清空;加载白名单仍拒非法 action 并计 skipped;
|
|
36
|
+
**dry_run 逐字节不动盘**(#72 的 G2 判据)。
|
|
37
|
+
S10 墓碑:`_done` 条目加载时跳过(既有语义,S4 的读改写也据此清理)。
|
|
38
|
+
|
|
39
|
+
运行:python -X utf8 -m md_cg.test_issue265_coldverify_multiproc
|
|
40
|
+
python -X utf8 -m md_cg.test_issue265_coldverify_multiproc --mutate
|
|
41
|
+
"""
|
|
42
|
+
from __future__ import annotations
|
|
43
|
+
|
|
44
|
+
import io
|
|
45
|
+
import json
|
|
46
|
+
import os
|
|
47
|
+
import statistics
|
|
48
|
+
import subprocess
|
|
49
|
+
import sys
|
|
50
|
+
import tempfile
|
|
51
|
+
import textwrap
|
|
52
|
+
import time
|
|
53
|
+
|
|
54
|
+
_TMP = tempfile.mkdtemp(prefix="i265g_")
|
|
55
|
+
# ★ 目录名不可用 "aux"——AUX 是 Windows 保留设备名(#245 实测踩到)。
|
|
56
|
+
os.environ["MDCG_AUX_ROOT"] = os.path.join(_TMP, "auxstore")
|
|
57
|
+
os.makedirs(os.environ["MDCG_AUX_ROOT"], exist_ok=True)
|
|
58
|
+
|
|
59
|
+
_REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
60
|
+
if _REPO not in sys.path:
|
|
61
|
+
sys.path.insert(0, _REPO)
|
|
62
|
+
|
|
63
|
+
if hasattr(sys.stdout, "reconfigure"):
|
|
64
|
+
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
65
|
+
|
|
66
|
+
from md_cg import coldverify as CV # noqa: E402
|
|
67
|
+
from md_cg.fsutil import read_jsonl # noqa: E402
|
|
68
|
+
|
|
69
|
+
_OK = 0
|
|
70
|
+
_BAD = []
|
|
71
|
+
_N = [0]
|
|
72
|
+
|
|
73
|
+
|
|
74
|
+
def _check(name, cond, detail=""):
|
|
75
|
+
global _OK
|
|
76
|
+
if cond:
|
|
77
|
+
_OK += 1
|
|
78
|
+
print(" ok %s" % name)
|
|
79
|
+
else:
|
|
80
|
+
_BAD.append(name)
|
|
81
|
+
print(" FAIL %s %s" % (name, detail))
|
|
82
|
+
|
|
83
|
+
|
|
84
|
+
def _root():
|
|
85
|
+
_N[0] += 1
|
|
86
|
+
r = os.path.join(_TMP, "r%d" % _N[0])
|
|
87
|
+
os.makedirs(r, exist_ok=True)
|
|
88
|
+
return r
|
|
89
|
+
|
|
90
|
+
|
|
91
|
+
def _qpath(root):
|
|
92
|
+
return os.path.join(root, CV.QUEUE_FILE)
|
|
93
|
+
|
|
94
|
+
|
|
95
|
+
def _tasks(root):
|
|
96
|
+
p = _qpath(root)
|
|
97
|
+
return list(read_jsonl(p)) if os.path.exists(p) else []
|
|
98
|
+
|
|
99
|
+
|
|
100
|
+
def _ids(root):
|
|
101
|
+
return sorted(t.get("node_id") for t in _tasks(root))
|
|
102
|
+
|
|
103
|
+
|
|
104
|
+
class _NoCG:
|
|
105
|
+
"""drain 的 cg 替身:get() 恒 None ⇒ reverify 走 node_not_found 分支,
|
|
106
|
+
不碰真库(本件只关心**落盘**,不关心验证结论)。"""
|
|
107
|
+
|
|
108
|
+
def get(self, nid):
|
|
109
|
+
return None
|
|
110
|
+
|
|
111
|
+
|
|
112
|
+
def _src(rel):
|
|
113
|
+
return io.open(os.path.join(_REPO, rel), encoding="utf-8",
|
|
114
|
+
errors="replace").read()
|
|
115
|
+
|
|
116
|
+
|
|
117
|
+
def _cold_body(name):
|
|
118
|
+
src = _src(os.path.join("md_cg", "coldverify.py"))
|
|
119
|
+
i0 = src.index(" def %s(" % name)
|
|
120
|
+
nxt = src.find("\n def ", i0 + 10)
|
|
121
|
+
return src[i0:nxt if nxt > 0 else len(src)]
|
|
122
|
+
|
|
123
|
+
|
|
124
|
+
def s1():
|
|
125
|
+
print("== S1 结构:追加 + 只删自己消费的 ==")
|
|
126
|
+
enq = _cold_body("enqueue")
|
|
127
|
+
dr = _cold_body("drain")
|
|
128
|
+
_check("S1a enqueue 走 _append_persisted", "_append_persisted(task)" in enq)
|
|
129
|
+
_check("S1b enqueue **不再**走 _persist(全量覆写)",
|
|
130
|
+
"_persist()" not in enq, enq[-200:])
|
|
131
|
+
_check("S1c drain 走 _drop_persisted", "_drop_persisted(batch)" in dr)
|
|
132
|
+
_check("S1d drain **不再**走 _persist", "_persist()" not in dr)
|
|
133
|
+
_check("S1e _append_persisted 用 O_APPEND 追加",
|
|
134
|
+
"os.O_APPEND" in _cold_body("_append_persisted"))
|
|
135
|
+
_check("S1f _drop_persisted 用 FileLock(strict=True) + atomic_write",
|
|
136
|
+
"strict=True" in _cold_body("_drop_persisted")
|
|
137
|
+
and "_atomic_write" in _cold_body("_drop_persisted"))
|
|
138
|
+
|
|
139
|
+
|
|
140
|
+
def _child_script():
|
|
141
|
+
p = os.path.join(_TMP, "child.py")
|
|
142
|
+
if not os.path.exists(p):
|
|
143
|
+
with io.open(p, "w", encoding="utf-8") as f:
|
|
144
|
+
f.write(textwrap.dedent('''
|
|
145
|
+
import os, sys, time
|
|
146
|
+
sys.path.insert(0, r"%s")
|
|
147
|
+
from md_cg.coldverify import ColdVerifyQueue
|
|
148
|
+
tag, root, tmp = sys.argv[1], sys.argv[2], sys.argv[3]
|
|
149
|
+
q = ColdVerifyQueue(root=root)
|
|
150
|
+
open(os.path.join(tmp, "ready_" + tag), "w").write("1")
|
|
151
|
+
while not (os.path.exists(os.path.join(tmp, "ready_liveA"))
|
|
152
|
+
and os.path.exists(os.path.join(tmp, "ready_liveB"))):
|
|
153
|
+
time.sleep(0.02)
|
|
154
|
+
q.enqueue(tag, action="reverify")
|
|
155
|
+
''') % _REPO)
|
|
156
|
+
return p
|
|
157
|
+
|
|
158
|
+
|
|
159
|
+
def s2():
|
|
160
|
+
print("== S2 ★ 两进程(真并发、同根)各自入队 ==")
|
|
161
|
+
root = _root()
|
|
162
|
+
child = _child_script()
|
|
163
|
+
try:
|
|
164
|
+
procs = [subprocess.Popen(
|
|
165
|
+
[sys.executable, "-X", "utf8", child, t, root, _TMP],
|
|
166
|
+
stdout=subprocess.PIPE, stderr=subprocess.PIPE) for t in
|
|
167
|
+
("liveA", "liveB")]
|
|
168
|
+
for pr in procs:
|
|
169
|
+
pr.communicate(timeout=180)
|
|
170
|
+
except Exception as exc: # noqa: BLE001
|
|
171
|
+
_check("S2 起子进程失败:%s" % exc, False)
|
|
172
|
+
return
|
|
173
|
+
got = _ids(root)
|
|
174
|
+
_check("S2a 盘上 **2** 条(改前=1,后写者抹掉先写者)", len(got) == 2, got)
|
|
175
|
+
_check("S2b 两条分别是 liveA 与 liveB", got == ["liveA", "liveB"], got)
|
|
176
|
+
|
|
177
|
+
|
|
178
|
+
def s3():
|
|
179
|
+
print("== S3 同进程两实例(各自先构造再各自入队)==")
|
|
180
|
+
root = _root()
|
|
181
|
+
q1 = CV.ColdVerifyQueue(root=root)
|
|
182
|
+
q2 = CV.ColdVerifyQueue(root=root)
|
|
183
|
+
q1.enqueue("nodeA", action="reverify")
|
|
184
|
+
q2.enqueue("nodeB", action="reverify")
|
|
185
|
+
got = _ids(root)
|
|
186
|
+
_check("S3a 盘上 **2** 条(改前=1)", len(got) == 2, got)
|
|
187
|
+
_check("S3b 两实例内存各 1 条(内存面本就独立)",
|
|
188
|
+
len(q1._queue) == 1 and len(q2._queue) == 1)
|
|
189
|
+
|
|
190
|
+
|
|
191
|
+
def s4():
|
|
192
|
+
print("== S4 drain 只删自己消费的 ==")
|
|
193
|
+
root = _root()
|
|
194
|
+
qa = CV.ColdVerifyQueue(root=root)
|
|
195
|
+
qb = CV.ColdVerifyQueue(root=root)
|
|
196
|
+
qb.enqueue("consume_me_A", action="reverify") # 盘:[consume_me_A]
|
|
197
|
+
qa.enqueue("keep_me_B", action="reverify") # 盘:[consume_me_A, keep_me_B]
|
|
198
|
+
_check("S4-pre 盘上两条都在(追加生效)",
|
|
199
|
+
_ids(root) == ["consume_me_A", "keep_me_B"], _ids(root))
|
|
200
|
+
# qc 加载盘面后**只消费其中一条**(模拟「本实例消费,他实例那条还没被消费」)
|
|
201
|
+
qc = CV.ColdVerifyQueue(root=root)
|
|
202
|
+
qc._queue = type(qc._queue)(
|
|
203
|
+
[t for t in qc._queue if t["node_id"] == "consume_me_A"])
|
|
204
|
+
_check("S4-pre2 qc 只认 consume_me_A",
|
|
205
|
+
[x["node_id"] for x in qc._queue] == ["consume_me_A"])
|
|
206
|
+
qc.drain(_NoCG())
|
|
207
|
+
got = _ids(root)
|
|
208
|
+
_check("S4a 自己消费的已从盘上摘除", "consume_me_A" not in got, got)
|
|
209
|
+
_check("S4b ★ 他实例未消费的条目**留在盘上**", "keep_me_B" in got, got)
|
|
210
|
+
_check("S4c 盘上恰 1 条", len(got) == 1, got)
|
|
211
|
+
|
|
212
|
+
|
|
213
|
+
def s5():
|
|
214
|
+
print("== S5 半截行:整份队列仍恢复,且后续追加不粘连 ==")
|
|
215
|
+
root = _root()
|
|
216
|
+
qf = _qpath(root)
|
|
217
|
+
with io.open(qf, "w", encoding="utf-8") as f:
|
|
218
|
+
f.write(json.dumps({"node_id": "ok1", "action": "reverify"}) + "\n")
|
|
219
|
+
f.write(json.dumps({"node_id": "ok2", "action": "reverify"}) + "\n")
|
|
220
|
+
f.write('{"node_id": "half", "act') # 上一个写者被杀在中途
|
|
221
|
+
q = CV.ColdVerifyQueue(root=root)
|
|
222
|
+
_check("S5a ★ 半截行不阻断整份恢复(改前=0 条)",
|
|
223
|
+
q.status()["queue_size"] == 2, q.status()["queue_size"])
|
|
224
|
+
q.enqueue("after_half", action="reverify")
|
|
225
|
+
got = _ids(root)
|
|
226
|
+
_check("S5b 追加的新条目可读(未粘在半截行上)", "after_half" in got, got)
|
|
227
|
+
_check("S5c 两行好条目仍在", {"ok1", "ok2"} <= set(got), got)
|
|
228
|
+
|
|
229
|
+
|
|
230
|
+
def s6():
|
|
231
|
+
print("== S6 反陈化:三处理由在源码里 ==")
|
|
232
|
+
src = _src(os.path.join("md_cg", "coldverify.py"))
|
|
233
|
+
_check("S6a 标注 issue #265", "issue #265" in src)
|
|
234
|
+
_check("S6b 写明「追加在物理上抹不掉别人的条目」",
|
|
235
|
+
"抹不掉" in src)
|
|
236
|
+
_check("S6c 写明「只删自己消费的」", "只删自己消费的" in src
|
|
237
|
+
or "只删自己消费" in src)
|
|
238
|
+
_check("S6d 写明半截行/整份不恢复的旧病象",
|
|
239
|
+
"整份队列都不恢复" in src)
|
|
240
|
+
_check("S6e 写明跨进程 FileLock 的必要性(与读改写互斥)",
|
|
241
|
+
"读改写" in src)
|
|
242
|
+
|
|
243
|
+
|
|
244
|
+
def _prepatch_src():
|
|
245
|
+
def _g(*a):
|
|
246
|
+
return subprocess.run(list(a), cwd=_REPO, capture_output=True,
|
|
247
|
+
text=True, encoding="utf-8", errors="replace",
|
|
248
|
+
timeout=60)
|
|
249
|
+
lg = _g("git", "log", "-S_append_persisted", "--format=%H", "--",
|
|
250
|
+
"md_cg/coldverify.py")
|
|
251
|
+
if lg.returncode == 0:
|
|
252
|
+
shas = [x.strip() for x in (lg.stdout or "").splitlines() if x.strip()]
|
|
253
|
+
if shas:
|
|
254
|
+
s = _g("git", "show", shas[-1] + "^:md_cg/coldverify.py")
|
|
255
|
+
if s.returncode == 0:
|
|
256
|
+
return s.stdout, "引入提交 %s 的父版本" % shas[-1][:8]
|
|
257
|
+
s = _g("git", "show", "HEAD:md_cg/coldverify.py")
|
|
258
|
+
if s.returncode != 0:
|
|
259
|
+
return None, "git show HEAD rc=%s" % s.returncode
|
|
260
|
+
return s.stdout, "HEAD(本改动尚未提交)"
|
|
261
|
+
|
|
262
|
+
|
|
263
|
+
def s7():
|
|
264
|
+
print("== S7 修复前原形(提交前/后都稳定)==")
|
|
265
|
+
t, how = _prepatch_src()
|
|
266
|
+
if t is None:
|
|
267
|
+
_check("S7 取修复前源失败:%s" % how, False)
|
|
268
|
+
return
|
|
269
|
+
print(" (修复前源取自 %s)" % how)
|
|
270
|
+
_check("S7a 修复前无 _append_persisted", "_append_persisted" not in t)
|
|
271
|
+
_check("S7b 修复前无 _drop_persisted", "_drop_persisted" not in t)
|
|
272
|
+
_check("S7c ★ 修复前的 _persist 确是「全量覆写」原形",
|
|
273
|
+
"持久化当前队列(全量覆写)" in t)
|
|
274
|
+
|
|
275
|
+
|
|
276
|
+
def s8():
|
|
277
|
+
print("== S8 代价不退化(报告要求「同量级」)==")
|
|
278
|
+
root = _root()
|
|
279
|
+
q = CV.ColdVerifyQueue(root=root)
|
|
280
|
+
n = 300
|
|
281
|
+
ts = []
|
|
282
|
+
for i in range(n):
|
|
283
|
+
t0 = time.perf_counter()
|
|
284
|
+
q.enqueue("n%d" % i, action="reverify")
|
|
285
|
+
ts.append((time.perf_counter() - t0) * 1000.0)
|
|
286
|
+
med = statistics.median(ts)
|
|
287
|
+
first = statistics.median(ts[:50])
|
|
288
|
+
last = statistics.median(ts[-50:])
|
|
289
|
+
print(" 中位=%.3fms 首50=%.3fms 末50=%.3fms(改前实测中位 0.407ms)"
|
|
290
|
+
% (med, first, last))
|
|
291
|
+
_check("S8a 入队中位 < 5ms/次(宽裕上界,防退化)", med < 5.0, med)
|
|
292
|
+
# 追加是 O(1):末段不得显著慢于首段(全量覆写会随队列增长而变慢)
|
|
293
|
+
_check("S8b 追加是 O(1):末 50 次 ≤ 首 50 次的 3 倍",
|
|
294
|
+
last <= max(first * 3.0, 1.0), (first, last))
|
|
295
|
+
|
|
296
|
+
|
|
297
|
+
def s9():
|
|
298
|
+
print("== S9 既有语义不破 ==")
|
|
299
|
+
root = _root()
|
|
300
|
+
q = CV.ColdVerifyQueue(root=root)
|
|
301
|
+
q.enqueue("mem_crash_test", action="reverify")
|
|
302
|
+
q2 = CV.ColdVerifyQueue(root=root)
|
|
303
|
+
_check("S9a 崩溃恢复:新实例恢复未处理任务",
|
|
304
|
+
q2.status()["queue_size"] >= 1)
|
|
305
|
+
q2.clear()
|
|
306
|
+
_check("S9b clear() 仍清空队列文件", _tasks(root) == [], _tasks(root))
|
|
307
|
+
|
|
308
|
+
# 加载白名单(v15-1):非法 action 拒收并计 skipped
|
|
309
|
+
root2 = _root()
|
|
310
|
+
with io.open(_qpath(root2), "w", encoding="utf-8") as f:
|
|
311
|
+
f.write(json.dumps({"node_id": "bad", "action": "rm_rf"}) + "\n")
|
|
312
|
+
f.write(json.dumps({"node_id": "good", "action": "reverify"}) + "\n")
|
|
313
|
+
q3 = CV.ColdVerifyQueue(root=root2)
|
|
314
|
+
_check("S9c 加载路径只收合法 action", q3.status()["queue_size"] == 1,
|
|
315
|
+
q3.status()["queue_size"])
|
|
316
|
+
_check("S9d 非法 action 计入 skipped(可审计)",
|
|
317
|
+
q3.status()["stats"]["skipped"] >= 1)
|
|
318
|
+
|
|
319
|
+
# #72 的 G2:dry_run 逐字节不动盘
|
|
320
|
+
root3 = _root()
|
|
321
|
+
q4 = CV.ColdVerifyQueue(root=root3)
|
|
322
|
+
q4.enqueue("d1", action="reverify")
|
|
323
|
+
before = io.open(_qpath(root3), "rb").read()
|
|
324
|
+
q4.drain(_NoCG(), dry_run=True)
|
|
325
|
+
after = io.open(_qpath(root3), "rb").read()
|
|
326
|
+
_check("S9e ★ dry_run 前后队列文件**逐字节不变**(#72 G2)",
|
|
327
|
+
before == after)
|
|
328
|
+
|
|
329
|
+
|
|
330
|
+
def s10():
|
|
331
|
+
print("== S10 墓碑:_done 条目加载时跳过 ==")
|
|
332
|
+
root = _root()
|
|
333
|
+
with io.open(_qpath(root), "w", encoding="utf-8") as f:
|
|
334
|
+
f.write(json.dumps({"node_id": "done1", "action": "reverify",
|
|
335
|
+
"_done": True}) + "\n")
|
|
336
|
+
f.write(json.dumps({"node_id": "live1", "action": "reverify"}) + "\n")
|
|
337
|
+
q = CV.ColdVerifyQueue(root=root)
|
|
338
|
+
_check("S10a _done 条目不恢复", q.status()["queue_size"] == 1,
|
|
339
|
+
q.status()["queue_size"])
|
|
340
|
+
_check("S10b 未消费条目照常恢复",
|
|
341
|
+
[t.get("node_id") for t in q._queue] == ["live1"])
|
|
342
|
+
|
|
343
|
+
|
|
344
|
+
_GROUPS = (s1, s2, s3, s4, s5, s6, s7, s8, s9, s10)
|
|
345
|
+
|
|
346
|
+
|
|
347
|
+
def _run_groups():
|
|
348
|
+
global _OK
|
|
349
|
+
_OK = 0
|
|
350
|
+
_BAD.clear()
|
|
351
|
+
for g in _GROUPS:
|
|
352
|
+
try:
|
|
353
|
+
g()
|
|
354
|
+
except Exception as exc: # noqa: BLE001
|
|
355
|
+
_check("断言组 %s 抛异常:%s" % (g.__name__, exc), False)
|
|
356
|
+
import traceback
|
|
357
|
+
print(traceback.format_exc()[-600:])
|
|
358
|
+
return len(_BAD)
|
|
359
|
+
|
|
360
|
+
|
|
361
|
+
def main():
|
|
362
|
+
n = _run_groups()
|
|
363
|
+
print()
|
|
364
|
+
print("冷路径跨实例守卫:%d 通过,%d 失败" % (_OK, n))
|
|
365
|
+
return 1 if n else 0
|
|
366
|
+
|
|
367
|
+
|
|
368
|
+
_MUTATIONS = (
|
|
369
|
+
("V1 enqueue 回到全量覆写(本件病象)",
|
|
370
|
+
" self._append_persisted(task)\n",
|
|
371
|
+
" self._persist()\n", "S2"),
|
|
372
|
+
("V2 drain 回到全量覆写(抹掉他实例的条目)",
|
|
373
|
+
" self._drop_persisted(batch)\n",
|
|
374
|
+
" with self._lock:\n self._persist()\n", "S4"),
|
|
375
|
+
("V3 追加前不补换行(半截行粘连)",
|
|
376
|
+
' if _ends_mid_line(self._queue_path):\n line = "\\n" + line\n',
|
|
377
|
+
"", "S5"),
|
|
378
|
+
)
|
|
379
|
+
|
|
380
|
+
|
|
381
|
+
def _reload():
|
|
382
|
+
import importlib
|
|
383
|
+
from md_cg import coldverify as _c
|
|
384
|
+
importlib.reload(_c)
|
|
385
|
+
globals()["CV"] = _c
|
|
386
|
+
|
|
387
|
+
|
|
388
|
+
def _mutate():
|
|
389
|
+
bad = []
|
|
390
|
+
p = os.path.join(_REPO, "md_cg", "coldverify.py")
|
|
391
|
+
with io.open(p, encoding="utf-8", newline="") as f:
|
|
392
|
+
pristine = f.read()
|
|
393
|
+
if "_append_persisted" not in pristine:
|
|
394
|
+
print(" SOURCE-ALREADY-MUTATED:coldverify.py 缺 _append_persisted")
|
|
395
|
+
return 1
|
|
396
|
+
for name, anchor, repl, want in _MUTATIONS:
|
|
397
|
+
with io.open(p, encoding="utf-8", newline="") as f:
|
|
398
|
+
orig = f.read()
|
|
399
|
+
NL = "\r\n" if "\r\n" in orig else "\n"
|
|
400
|
+
a_ = anchor.replace("\n", NL)
|
|
401
|
+
r_ = repl.replace("\n", NL)
|
|
402
|
+
try:
|
|
403
|
+
if a_ not in orig:
|
|
404
|
+
print(" ANCHOR-MISS %s" % name)
|
|
405
|
+
bad.append(name)
|
|
406
|
+
continue
|
|
407
|
+
with io.open(p, "w", encoding="utf-8", newline="") as f:
|
|
408
|
+
f.write(orig.replace(a_, r_, 1))
|
|
409
|
+
_reload()
|
|
410
|
+
_run_groups()
|
|
411
|
+
reds = list(_BAD)
|
|
412
|
+
hit = any(x.startswith(want) for x in reds)
|
|
413
|
+
print(" %-4s %-48s 红项=%-3d 命中%s=%s"
|
|
414
|
+
% ("OK" if hit else "BAD", name, len(reds), want,
|
|
415
|
+
"是" if hit else "否"))
|
|
416
|
+
if not hit:
|
|
417
|
+
bad.append(name)
|
|
418
|
+
finally:
|
|
419
|
+
with io.open(p, "w", encoding="utf-8", newline="") as f:
|
|
420
|
+
f.write(pristine)
|
|
421
|
+
with io.open(p, encoding="utf-8", newline="") as f:
|
|
422
|
+
if f.read() != pristine:
|
|
423
|
+
print(" RESTORE-FAILED %s" % name)
|
|
424
|
+
bad.append(name + "(恢复失败)")
|
|
425
|
+
_reload()
|
|
426
|
+
if bad:
|
|
427
|
+
print()
|
|
428
|
+
print("定点变异自证:FAIL -- %s" % "、".join(bad))
|
|
429
|
+
return 1
|
|
430
|
+
print()
|
|
431
|
+
print("定点变异自证:PASS(每处判据都被打红)")
|
|
432
|
+
return 0
|
|
433
|
+
|
|
434
|
+
|
|
435
|
+
if __name__ == "__main__":
|
|
436
|
+
if "--mutate" in sys.argv:
|
|
437
|
+
sys.exit(_mutate())
|
|
438
|
+
sys.exit(main())
|