@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,345 +1,345 @@
|
|
|
1
|
-
# -*- coding: utf-8 -*-
|
|
2
|
-
# 功能名:#348-B MERGE/CONVERGE 目标读改写的跨进程锁(reinforce/converge_into + 审核 merge 支)
|
|
3
|
-
# 生效条件:python -X utf8 -m md_cg.test_issue348_merge_rmw_lock [--mutate];
|
|
4
|
-
# 被测面=md_cg/mdcos.py 中**六处** `with merge_rmw_lock(self):` 落点
|
|
5
|
-
# (_mutation_execute 的 B 合并两原语、review_decide 的 merge 支、maintain prefeed 的
|
|
6
|
-
# reinforce、remember_gated 的 CONVERGE 支与 MERGE 支)与 md_cg/fsutil.py 的 merge_rmw_lock
|
|
7
|
-
# 子功能:A1=4 进程并发 remember_gated 到同一 MERGE 目标(加宽读改写窗口)——
|
|
8
|
-
# 已回执 MERGE 的新值必须全部在目标正文里;A2=另两轮合计丢失 0;
|
|
9
|
-
# K1=串行 MERGE 仍追加(锁不是空操作/不吞聚合);
|
|
10
|
-
# E1=merge_rmw_lock 走 FileLock strict;E2/E3a/E3b/E3c=逐落点结构锚;
|
|
11
|
-
# E3d=六处落点计数(防只改一半);E4=审核 accept 的 merge 支整段在锁内。
|
|
12
|
-
# **CONVERGE 支只有结构锚 E2,无并发行为腿**——CONVERGE 需要 remember_gated 判出
|
|
13
|
-
# 冲突才走到,构造成本高且与 MERGE 共用同一把根锁(同一原语同一锁),故行为面由
|
|
14
|
-
# MERGE 腿代偿;此点如实写明,不宣称已覆盖 CONVERGE 的行为面。
|
|
15
|
-
# 执行:每轮新建隔离库;写者各自独立进程自旋对齐后并发 remember_gated;
|
|
16
|
-
# worker 内把 forgetting.aggregate_line 包一层睡 0.3s——只拉长「读到旧正文 → 写回」
|
|
17
|
-
# 的窗口,不改任何判据(#348 报告 B.3 的定向验收手法)
|
|
18
|
-
# 验证方式:全部 PASS 即通过(rc=0);--mutate 走镜像树定点变异,红项集合须恰为预期
|
|
19
|
-
# 不适用条件:① 不测缺省 confirm 档(该档 MERGE 先出变更单、不进合并原语——报告 B.1 前提);
|
|
20
|
-
# ② 不测吞吐/锁开销;③ 不判「不同目标是否并行」(按根一把是刻意的粒度选择,见
|
|
21
|
-
# fsutil.merge_rmw_lock 文档串);④ 不覆盖 CONVERGE 的行为面(理由见「子功能」末段)
|
|
22
|
-
"""#348-B 守卫:MERGE/CONVERGE 的「读目标 → 聚合 → 整份覆写」必须跨进程互斥。
|
|
23
|
-
|
|
24
|
-
病象(修前,探针 .tmp/u06/probe_348b.py 实测):4 进程 × 5 轮,MERGE 回执 20 条、
|
|
25
|
-
新值丢失 15 条(5/5 轮)——后写者用自己读到的旧正文整份覆盖前者刚追加的聚合行,
|
|
26
|
-
两边都回执 MERGE,被覆盖的新值在库里 0 命中、merge_count 也少加。
|
|
27
|
-
"""
|
|
28
|
-
import os
|
|
29
|
-
import shutil
|
|
30
|
-
import subprocess
|
|
31
|
-
import sys
|
|
32
|
-
import tempfile
|
|
33
|
-
|
|
34
|
-
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
35
|
-
|
|
36
|
-
_REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
37
|
-
if _REPO not in sys.path:
|
|
38
|
-
sys.path.insert(0, _REPO)
|
|
39
|
-
|
|
40
|
-
PASSED, FAILS = [], []
|
|
41
|
-
NL = chr(10)
|
|
42
|
-
|
|
43
|
-
BASE = ("差旅报销上限 15000 元,负责人张三,财务部审批,发票须在 30 天内提交,"
|
|
44
|
-
"超标需副总签字,住宿标准一线城市 600 元每晚,二线城市 400 元每晚,"
|
|
45
|
-
"餐补每天 100 元,交通费实报实销")
|
|
46
|
-
|
|
47
|
-
#: 并发 MERGE worker:加宽 aggregate_line 的读改写窗口(只 sleep,不改判据)。
|
|
48
|
-
_W_MERGE = r'''
|
|
49
|
-
import json, sys, time
|
|
50
|
-
sys.path.insert(0, sys.argv[1])
|
|
51
|
-
from md_cg.mdcos import MdCGOS
|
|
52
|
-
from md_cg import forgetting
|
|
53
|
-
root, i, t0, base = sys.argv[2], int(sys.argv[3]), float(sys.argv[4]), sys.argv[5]
|
|
54
|
-
_orig = forgetting.aggregate_line
|
|
55
|
-
def _slow(old, new):
|
|
56
|
-
time.sleep(0.3)
|
|
57
|
-
return _orig(old, new)
|
|
58
|
-
forgetting.aggregate_line = _slow
|
|
59
|
-
cg = MdCGOS(root)
|
|
60
|
-
while time.time() < t0:
|
|
61
|
-
pass
|
|
62
|
-
r = cg.remember_gated(None, base + "\nVAL%04d" % (7000 + i),
|
|
63
|
-
layer="contextual", role="user")
|
|
64
|
-
cg.close()
|
|
65
|
-
print(json.dumps({"i": i, "verdict": r.get("verdict"),
|
|
66
|
-
"merged_into": r.get("merged_into")}))
|
|
67
|
-
'''
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
def _check(n, c, d=''):
|
|
71
|
-
if c:
|
|
72
|
-
print(' PASS ' + n)
|
|
73
|
-
PASSED.append(n)
|
|
74
|
-
else:
|
|
75
|
-
print(' FAIL ' + n + ' ' + str(d)[:200])
|
|
76
|
-
FAILS.append(n)
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
def _env(t, root):
|
|
80
|
-
env = {k: v for k, v in os.environ.items()
|
|
81
|
-
if not k.startswith(("MDCG_", "PYTHON"))}
|
|
82
|
-
for k, d in (("HOME", "home"), ("MDCG_STATE_ROOT", "state"),
|
|
83
|
-
("MDCG_AUX_ROOT", "auxstore"), ("MDCG_DATA_ROOT", "data"),
|
|
84
|
-
("MDCG_EXPORT_ROOT", "export")):
|
|
85
|
-
env[k] = os.path.join(t, d)
|
|
86
|
-
os.makedirs(env[k])
|
|
87
|
-
env.update(MDCG_ROOT=root, MDCG_AUTONOMY="full", MDCG_SUSTAIN="0",
|
|
88
|
-
MDCG_SLEEP="0", PYTHONUTF8="1", PYTHONPATH=_REPO)
|
|
89
|
-
return env
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
def _seed(env, root):
|
|
93
|
-
subprocess.run(
|
|
94
|
-
[sys.executable, "-X", "utf8", "-c",
|
|
95
|
-
"import sys;sys.path.insert(0,sys.argv[1]);"
|
|
96
|
-
"from md_cg.mdcos import MdCGOS;"
|
|
97
|
-
"cg=MdCGOS(sys.argv[2]);cg.add('policy',sys.argv[3],layer='contextual');"
|
|
98
|
-
"cg.close()", _REPO, root, BASE],
|
|
99
|
-
env=env, check=True, cwd=env["HOME"], capture_output=True)
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
def _policy_body(root):
|
|
103
|
-
for dirpath, _d, files in os.walk(root):
|
|
104
|
-
if "policy.md" in files:
|
|
105
|
-
with open(os.path.join(dirpath, "policy.md"),
|
|
106
|
-
encoding="utf-8") as f:
|
|
107
|
-
return f.read()
|
|
108
|
-
return ""
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
def _round(tag, k=4):
|
|
112
|
-
t = tempfile.mkdtemp(prefix="i348b_" + tag + "_")
|
|
113
|
-
root = os.path.join(t, "root")
|
|
114
|
-
env = _env(t, root)
|
|
115
|
-
_seed(env, root)
|
|
116
|
-
t0 = __import__("time").time() + 2.0
|
|
117
|
-
ps = [subprocess.Popen(
|
|
118
|
-
[sys.executable, "-X", "utf8", "-c", _W_MERGE, _REPO, root, str(i),
|
|
119
|
-
str(t0), BASE], env=env, cwd=env["HOME"],
|
|
120
|
-
stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True,
|
|
121
|
-
encoding="utf-8", errors="replace")
|
|
122
|
-
for i in range(k)]
|
|
123
|
-
res = []
|
|
124
|
-
for p in ps:
|
|
125
|
-
o, e = p.communicate(timeout=180)
|
|
126
|
-
try:
|
|
127
|
-
res.append(__import__("json").loads(o.strip().splitlines()[-1]))
|
|
128
|
-
except Exception:
|
|
129
|
-
res.append({"i": -1, "verdict": "ERR " + e.strip()[-120:]})
|
|
130
|
-
return res, _policy_body(root)
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
def group_a1():
|
|
134
|
-
print('== A1:4 进程并发 MERGE 到同一目标(加宽窗口)==')
|
|
135
|
-
res, body = _round("a1")
|
|
136
|
-
ok = [r["i"] for r in res if r.get("verdict") == "MERGE"]
|
|
137
|
-
miss = [i for i in ok if "VAL%04d" % (7000 + i) not in body]
|
|
138
|
-
print(" verdicts=%s 丢失=%s" % ([r.get("verdict") for r in res], miss))
|
|
139
|
-
_check('A1a 全部写者都回执 MERGE(前提成立,否则本腿无效)',
|
|
140
|
-
len(ok) == 4, [r.get("verdict") for r in res])
|
|
141
|
-
_check('A1b 已回执 MERGE 的新值 100% 在目标正文里(丢失 0)',
|
|
142
|
-
len(ok) == 4 and not miss, miss)
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
def group_a2():
|
|
146
|
-
print('== A2:连跑 2 轮(判据稳定,不是单轮偶然)==')
|
|
147
|
-
lost = 0
|
|
148
|
-
for _ in range(2):
|
|
149
|
-
res, body = _round("a2")
|
|
150
|
-
ok = [r["i"] for r in res if r.get("verdict") == "MERGE"]
|
|
151
|
-
lost += len([i for i in ok if "VAL%04d" % (7000 + i) not in body])
|
|
152
|
-
_check('A2 两轮合计丢失 0', lost == 0, lost)
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
def group_k1():
|
|
156
|
-
print('== K1:串行 MERGE 仍追加(锁不吞聚合、不卡死)==')
|
|
157
|
-
t = tempfile.mkdtemp(prefix="i348b_k1_")
|
|
158
|
-
root = os.path.join(t, "root")
|
|
159
|
-
env = _env(t, root)
|
|
160
|
-
old = dict(os.environ)
|
|
161
|
-
try:
|
|
162
|
-
os.environ.update({k: v for k, v in env.items()
|
|
163
|
-
if k.startswith(("MDCG_", "HOME"))})
|
|
164
|
-
from md_cg.mdcos import MdCGOS
|
|
165
|
-
cg = MdCGOS(root)
|
|
166
|
-
cg.add("policy", BASE, layer="contextual")
|
|
167
|
-
r1 = cg.remember_gated(None, BASE + "\nVAL7001", layer="contextual",
|
|
168
|
-
role="user")
|
|
169
|
-
r2 = cg.remember_gated(None, BASE + "\nVAL7002", layer="contextual",
|
|
170
|
-
role="user")
|
|
171
|
-
got = cg.get("policy") or {}
|
|
172
|
-
cg.close()
|
|
173
|
-
finally:
|
|
174
|
-
os.environ.clear()
|
|
175
|
-
os.environ.update(old)
|
|
176
|
-
body = got.get("content") or ""
|
|
177
|
-
_check('K1 串行两次 MERGE 都回执 MERGE 且两值都在正文',
|
|
178
|
-
r1.get("verdict") == "MERGE" and r2.get("verdict") == "MERGE"
|
|
179
|
-
and "VAL7001" in body and "VAL7002" in body,
|
|
180
|
-
(r1.get("verdict"), r2.get("verdict"), body[-120:]))
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
def _src(rel):
|
|
184
|
-
with open(os.path.join(_REPO, rel), encoding="utf-8") as f:
|
|
185
|
-
return f.read()
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
def group_e():
|
|
189
|
-
print('== E 组:结构锚(fail-closed)==')
|
|
190
|
-
fs = _src("md_cg/fsutil.py")
|
|
191
|
-
mo = _src("md_cg/mdcos.py")
|
|
192
|
-
_check('E1 merge_rmw_lock 走 FileLock 且 strict=True',
|
|
193
|
-
"def merge_rmw_lock" in fs and "strict=True" in fs
|
|
194
|
-
and "FileLock(" in fs)
|
|
195
|
-
# 六个落点(remember_gated 的 MERGE/CONVERGE、maintain prefeed、变更单执行
|
|
196
|
-
# 的两原语、审核 accept 的 merge 支)都必须出现 `with merge_rmw_lock(self):`。
|
|
197
|
-
# 判据是「整次原语调用被这一行包住」——用原文片段钉(不靠行号)。
|
|
198
|
-
_check('E2 remember_gated CONVERGE 支在 merge_rmw_lock 内',
|
|
199
|
-
"with merge_rmw_lock(self):" + NL + " _conv = "
|
|
200
|
-
"writelimit.converge_into(" in mo)
|
|
201
|
-
_check('E3a remember_gated MERGE 支在 merge_rmw_lock 内',
|
|
202
|
-
"with merge_rmw_lock(self):" + NL + " "
|
|
203
|
-
'out["reinforced"] = forgetting.reinforce(' in mo)
|
|
204
|
-
_check('E3b maintain prefeed 的 reinforce 在 merge_rmw_lock 内',
|
|
205
|
-
"with merge_rmw_lock(self):" + NL + " "
|
|
206
|
-
'out["reinforced"] = forgetting.reinforce(' in mo)
|
|
207
|
-
_check('E3c 变更单执行(B 合并)两原语都在 merge_rmw_lock 内',
|
|
208
|
-
"with merge_rmw_lock(self):" + NL + " res = "
|
|
209
|
-
"writelimit.converge_into(self, tgt, after," in mo
|
|
210
|
-
and "with merge_rmw_lock(self):" + NL + " res = "
|
|
211
|
-
"forgetting.reinforce(self, tgt, override=_ovr," in mo)
|
|
212
|
-
_check('E3d 六处落点齐全(计数口径,防只改一半)',
|
|
213
|
-
mo.count("with merge_rmw_lock(self):") == 6,
|
|
214
|
-
mo.count("with merge_rmw_lock(self):"))
|
|
215
|
-
# 精确绑定审核 merge 支:从 `else: # merge` 起的切片里必须出现锁行
|
|
216
|
-
# (M2 把它换成 `if True:` 时该切片内不再有锁 ⇒ E4 单独转红)。
|
|
217
|
-
_seg4 = mo.split("else: # merge", 1)[1][:3000] if "else: # merge" in mo else ""
|
|
218
|
-
_check('E4 审核 accept 的 merge 支整段在 merge_rmw_lock 内',
|
|
219
|
-
"with merge_rmw_lock(self):" in _seg4)
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
def main():
|
|
223
|
-
print('== #348-B 守卫 ==')
|
|
224
|
-
try:
|
|
225
|
-
group_a1()
|
|
226
|
-
group_a2()
|
|
227
|
-
group_k1()
|
|
228
|
-
except Exception as e:
|
|
229
|
-
import traceback
|
|
230
|
-
traceback.print_exc()
|
|
231
|
-
_check('A/K 组内异常(fail-closed)', False, str(e)[:150])
|
|
232
|
-
group_e()
|
|
233
|
-
print('=' * 62)
|
|
234
|
-
print('#348-B 守卫:%d 通过,%d 失败' % (len(PASSED), len(FAILS)))
|
|
235
|
-
for f in FAILS:
|
|
236
|
-
print(' 红项:' + f)
|
|
237
|
-
return 0 if not FAILS else 1
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
def _mirror():
|
|
241
|
-
"""镜像树:md_cg 包 + 仓根一级模块 + data/policy.json(写链的包内默认策略)。"""
|
|
242
|
-
d = tempfile.mkdtemp(prefix="i348b_mirror_")
|
|
243
|
-
shutil.copytree(os.path.join(_REPO, "md_cg"),
|
|
244
|
-
os.path.join(d, "md_cg"),
|
|
245
|
-
ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
|
|
246
|
-
for fn in os.listdir(_REPO):
|
|
247
|
-
if fn.endswith(".py") and os.path.isfile(os.path.join(_REPO, fn)):
|
|
248
|
-
shutil.copy2(os.path.join(_REPO, fn), os.path.join(d, fn))
|
|
249
|
-
src_pol = os.path.join(_REPO, "data", "policy.json")
|
|
250
|
-
if os.path.exists(src_pol):
|
|
251
|
-
os.makedirs(os.path.join(d, "data"), exist_ok=True)
|
|
252
|
-
shutil.copy2(src_pol, os.path.join(d, "data", "policy.json"))
|
|
253
|
-
return d
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
def _run_in(tree):
|
|
257
|
-
p = subprocess.run([sys.executable, "-X", "utf8", "-m",
|
|
258
|
-
"md_cg.test_issue348_merge_rmw_lock"],
|
|
259
|
-
cwd=tree, capture_output=True, text=True, timeout=2400,
|
|
260
|
-
encoding="utf-8", errors="replace",
|
|
261
|
-
env=dict({k: v for k, v in os.environ.items()
|
|
262
|
-
if not k.startswith("PYTHON")},
|
|
263
|
-
PYTHONPATH=tree, PYTHONUTF8="1"))
|
|
264
|
-
reds = [ln.strip().split(" ", 1)[0].replace("FAIL ", "")
|
|
265
|
-
for ln in p.stdout.splitlines() if ln.strip().startswith("FAIL ")]
|
|
266
|
-
return p.returncode, reds, p.stdout + p.stderr
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
_MUTATIONS = [
|
|
270
|
-
# M1:把 remember_gated MERGE 支的锁换成 `if True:`(缩进不变 ⇒ 只撤互斥,
|
|
271
|
-
# 不改语义分支)——并发腿 A1b/A2 必须转红,结构锚 E3a 一并转红。
|
|
272
|
-
("M1 撤 remember_gated MERGE 支的跨进程锁",
|
|
273
|
-
[("md_cg/mdcos.py",
|
|
274
|
-
" with merge_rmw_lock(self):" + NL +
|
|
275
|
-
" out[\"reinforced\"] = forgetting.reinforce(",
|
|
276
|
-
" if True:" + NL +
|
|
277
|
-
" out[\"reinforced\"] = forgetting.reinforce(")],
|
|
278
|
-
("A1b", "A2", "E3a", "E3d")),
|
|
279
|
-
# M2:审核 accept 的 merge 支同款撤锁。
|
|
280
|
-
("M2 撤审核 accept 的 merge 支锁",
|
|
281
|
-
[("md_cg/mdcos.py",
|
|
282
|
-
" with merge_rmw_lock(self):" + NL +
|
|
283
|
-
" target = merge_into or "
|
|
284
|
-
"(item.get(\"extra\") or {}).get(\"merge_into\")",
|
|
285
|
-
" if True:" + NL +
|
|
286
|
-
" target = merge_into or "
|
|
287
|
-
"(item.get(\"extra\") or {}).get(\"merge_into\")")],
|
|
288
|
-
("E4", "E3d")),
|
|
289
|
-
]
|
|
290
|
-
|
|
291
|
-
def _mutate():
|
|
292
|
-
print('!! 定点变异自证:把锁撤掉,守卫必须转红')
|
|
293
|
-
tree = _mirror()
|
|
294
|
-
try:
|
|
295
|
-
rc, reds, out = _run_in(tree)
|
|
296
|
-
print(' 未变异镜像基线:rc=%d 红项=%d(须 rc=0/0 红)' % (rc, len(reds)))
|
|
297
|
-
if rc != 0 or reds:
|
|
298
|
-
print(chr(10).join(out.splitlines()[-25:]))
|
|
299
|
-
bad = []
|
|
300
|
-
for desc, edits, exp in _MUTATIONS:
|
|
301
|
-
backups = []
|
|
302
|
-
miss = []
|
|
303
|
-
for rel, oldp, newp in edits:
|
|
304
|
-
p = os.path.join(tree, rel)
|
|
305
|
-
with open(p, encoding="utf-8", newline="") as f:
|
|
306
|
-
t = f.read()
|
|
307
|
-
if t.count(oldp) != 1:
|
|
308
|
-
miss.append("%s 命中 %d 次" % (rel, t.count(oldp)))
|
|
309
|
-
continue
|
|
310
|
-
backups.append((p, t))
|
|
311
|
-
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
312
|
-
f.write(t.replace(oldp, newp, 1))
|
|
313
|
-
if miss:
|
|
314
|
-
bad.append("%s —— %s" % (desc, ";".join(miss)))
|
|
315
|
-
print(' ANCHOR-MISS ' + desc)
|
|
316
|
-
for p, t in backups:
|
|
317
|
-
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
318
|
-
f.write(t)
|
|
319
|
-
continue
|
|
320
|
-
rc2, reds2, out2 = _run_in(tree)
|
|
321
|
-
for p, t in backups:
|
|
322
|
-
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
323
|
-
f.write(t)
|
|
324
|
-
hit = sorted({e for r in reds2 for e in exp
|
|
325
|
-
if r.startswith(e)})
|
|
326
|
-
if rc2 != 0 and hit == sorted(exp):
|
|
327
|
-
print(' OK %s 红项=%s' % (desc, reds2))
|
|
328
|
-
else:
|
|
329
|
-
bad.append(desc)
|
|
330
|
-
print(' MISMATCH %s rc=%d 红项=%s' % (desc, rc2, reds2))
|
|
331
|
-
print(chr(10).join(out2.splitlines()[-20:]))
|
|
332
|
-
print('定点变异自证:%s(%d 条不合格)'
|
|
333
|
-
% ('PASS' if not bad else 'FAIL', len(bad)))
|
|
334
|
-
for b in bad:
|
|
335
|
-
print(' 不合格:' + b)
|
|
336
|
-
_check('变异自证全过', not bad, bad)
|
|
337
|
-
finally:
|
|
338
|
-
shutil.rmtree(tree, ignore_errors=True)
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
if __name__ == '__main__':
|
|
342
|
-
if '--mutate' in sys.argv:
|
|
343
|
-
_mutate()
|
|
344
|
-
sys.exit(0 if not FAILS else 1)
|
|
345
|
-
sys.exit(main())
|
|
1
|
+
# -*- coding: utf-8 -*-
|
|
2
|
+
# 功能名:#348-B MERGE/CONVERGE 目标读改写的跨进程锁(reinforce/converge_into + 审核 merge 支)
|
|
3
|
+
# 生效条件:python -X utf8 -m md_cg.test_issue348_merge_rmw_lock [--mutate];
|
|
4
|
+
# 被测面=md_cg/mdcos.py 中**六处** `with merge_rmw_lock(self):` 落点
|
|
5
|
+
# (_mutation_execute 的 B 合并两原语、review_decide 的 merge 支、maintain prefeed 的
|
|
6
|
+
# reinforce、remember_gated 的 CONVERGE 支与 MERGE 支)与 md_cg/fsutil.py 的 merge_rmw_lock
|
|
7
|
+
# 子功能:A1=4 进程并发 remember_gated 到同一 MERGE 目标(加宽读改写窗口)——
|
|
8
|
+
# 已回执 MERGE 的新值必须全部在目标正文里;A2=另两轮合计丢失 0;
|
|
9
|
+
# K1=串行 MERGE 仍追加(锁不是空操作/不吞聚合);
|
|
10
|
+
# E1=merge_rmw_lock 走 FileLock strict;E2/E3a/E3b/E3c=逐落点结构锚;
|
|
11
|
+
# E3d=六处落点计数(防只改一半);E4=审核 accept 的 merge 支整段在锁内。
|
|
12
|
+
# **CONVERGE 支只有结构锚 E2,无并发行为腿**——CONVERGE 需要 remember_gated 判出
|
|
13
|
+
# 冲突才走到,构造成本高且与 MERGE 共用同一把根锁(同一原语同一锁),故行为面由
|
|
14
|
+
# MERGE 腿代偿;此点如实写明,不宣称已覆盖 CONVERGE 的行为面。
|
|
15
|
+
# 执行:每轮新建隔离库;写者各自独立进程自旋对齐后并发 remember_gated;
|
|
16
|
+
# worker 内把 forgetting.aggregate_line 包一层睡 0.3s——只拉长「读到旧正文 → 写回」
|
|
17
|
+
# 的窗口,不改任何判据(#348 报告 B.3 的定向验收手法)
|
|
18
|
+
# 验证方式:全部 PASS 即通过(rc=0);--mutate 走镜像树定点变异,红项集合须恰为预期
|
|
19
|
+
# 不适用条件:① 不测缺省 confirm 档(该档 MERGE 先出变更单、不进合并原语——报告 B.1 前提);
|
|
20
|
+
# ② 不测吞吐/锁开销;③ 不判「不同目标是否并行」(按根一把是刻意的粒度选择,见
|
|
21
|
+
# fsutil.merge_rmw_lock 文档串);④ 不覆盖 CONVERGE 的行为面(理由见「子功能」末段)
|
|
22
|
+
"""#348-B 守卫:MERGE/CONVERGE 的「读目标 → 聚合 → 整份覆写」必须跨进程互斥。
|
|
23
|
+
|
|
24
|
+
病象(修前,探针 .tmp/u06/probe_348b.py 实测):4 进程 × 5 轮,MERGE 回执 20 条、
|
|
25
|
+
新值丢失 15 条(5/5 轮)——后写者用自己读到的旧正文整份覆盖前者刚追加的聚合行,
|
|
26
|
+
两边都回执 MERGE,被覆盖的新值在库里 0 命中、merge_count 也少加。
|
|
27
|
+
"""
|
|
28
|
+
import os
|
|
29
|
+
import shutil
|
|
30
|
+
import subprocess
|
|
31
|
+
import sys
|
|
32
|
+
import tempfile
|
|
33
|
+
|
|
34
|
+
sys.stdout.reconfigure(encoding="utf-8", errors="replace")
|
|
35
|
+
|
|
36
|
+
_REPO = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
|
37
|
+
if _REPO not in sys.path:
|
|
38
|
+
sys.path.insert(0, _REPO)
|
|
39
|
+
|
|
40
|
+
PASSED, FAILS = [], []
|
|
41
|
+
NL = chr(10)
|
|
42
|
+
|
|
43
|
+
BASE = ("差旅报销上限 15000 元,负责人张三,财务部审批,发票须在 30 天内提交,"
|
|
44
|
+
"超标需副总签字,住宿标准一线城市 600 元每晚,二线城市 400 元每晚,"
|
|
45
|
+
"餐补每天 100 元,交通费实报实销")
|
|
46
|
+
|
|
47
|
+
#: 并发 MERGE worker:加宽 aggregate_line 的读改写窗口(只 sleep,不改判据)。
|
|
48
|
+
_W_MERGE = r'''
|
|
49
|
+
import json, sys, time
|
|
50
|
+
sys.path.insert(0, sys.argv[1])
|
|
51
|
+
from md_cg.mdcos import MdCGOS
|
|
52
|
+
from md_cg import forgetting
|
|
53
|
+
root, i, t0, base = sys.argv[2], int(sys.argv[3]), float(sys.argv[4]), sys.argv[5]
|
|
54
|
+
_orig = forgetting.aggregate_line
|
|
55
|
+
def _slow(old, new):
|
|
56
|
+
time.sleep(0.3)
|
|
57
|
+
return _orig(old, new)
|
|
58
|
+
forgetting.aggregate_line = _slow
|
|
59
|
+
cg = MdCGOS(root)
|
|
60
|
+
while time.time() < t0:
|
|
61
|
+
pass
|
|
62
|
+
r = cg.remember_gated(None, base + "\nVAL%04d" % (7000 + i),
|
|
63
|
+
layer="contextual", role="user")
|
|
64
|
+
cg.close()
|
|
65
|
+
print(json.dumps({"i": i, "verdict": r.get("verdict"),
|
|
66
|
+
"merged_into": r.get("merged_into")}))
|
|
67
|
+
'''
|
|
68
|
+
|
|
69
|
+
|
|
70
|
+
def _check(n, c, d=''):
|
|
71
|
+
if c:
|
|
72
|
+
print(' PASS ' + n)
|
|
73
|
+
PASSED.append(n)
|
|
74
|
+
else:
|
|
75
|
+
print(' FAIL ' + n + ' ' + str(d)[:200])
|
|
76
|
+
FAILS.append(n)
|
|
77
|
+
|
|
78
|
+
|
|
79
|
+
def _env(t, root):
|
|
80
|
+
env = {k: v for k, v in os.environ.items()
|
|
81
|
+
if not k.startswith(("MDCG_", "PYTHON"))}
|
|
82
|
+
for k, d in (("HOME", "home"), ("MDCG_STATE_ROOT", "state"),
|
|
83
|
+
("MDCG_AUX_ROOT", "auxstore"), ("MDCG_DATA_ROOT", "data"),
|
|
84
|
+
("MDCG_EXPORT_ROOT", "export")):
|
|
85
|
+
env[k] = os.path.join(t, d)
|
|
86
|
+
os.makedirs(env[k])
|
|
87
|
+
env.update(MDCG_ROOT=root, MDCG_AUTONOMY="full", MDCG_SUSTAIN="0",
|
|
88
|
+
MDCG_SLEEP="0", PYTHONUTF8="1", PYTHONPATH=_REPO)
|
|
89
|
+
return env
|
|
90
|
+
|
|
91
|
+
|
|
92
|
+
def _seed(env, root):
|
|
93
|
+
subprocess.run(
|
|
94
|
+
[sys.executable, "-X", "utf8", "-c",
|
|
95
|
+
"import sys;sys.path.insert(0,sys.argv[1]);"
|
|
96
|
+
"from md_cg.mdcos import MdCGOS;"
|
|
97
|
+
"cg=MdCGOS(sys.argv[2]);cg.add('policy',sys.argv[3],layer='contextual');"
|
|
98
|
+
"cg.close()", _REPO, root, BASE],
|
|
99
|
+
env=env, check=True, cwd=env["HOME"], capture_output=True)
|
|
100
|
+
|
|
101
|
+
|
|
102
|
+
def _policy_body(root):
|
|
103
|
+
for dirpath, _d, files in os.walk(root):
|
|
104
|
+
if "policy.md" in files:
|
|
105
|
+
with open(os.path.join(dirpath, "policy.md"),
|
|
106
|
+
encoding="utf-8") as f:
|
|
107
|
+
return f.read()
|
|
108
|
+
return ""
|
|
109
|
+
|
|
110
|
+
|
|
111
|
+
def _round(tag, k=4):
|
|
112
|
+
t = tempfile.mkdtemp(prefix="i348b_" + tag + "_")
|
|
113
|
+
root = os.path.join(t, "root")
|
|
114
|
+
env = _env(t, root)
|
|
115
|
+
_seed(env, root)
|
|
116
|
+
t0 = __import__("time").time() + 2.0
|
|
117
|
+
ps = [subprocess.Popen(
|
|
118
|
+
[sys.executable, "-X", "utf8", "-c", _W_MERGE, _REPO, root, str(i),
|
|
119
|
+
str(t0), BASE], env=env, cwd=env["HOME"],
|
|
120
|
+
stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True,
|
|
121
|
+
encoding="utf-8", errors="replace")
|
|
122
|
+
for i in range(k)]
|
|
123
|
+
res = []
|
|
124
|
+
for p in ps:
|
|
125
|
+
o, e = p.communicate(timeout=180)
|
|
126
|
+
try:
|
|
127
|
+
res.append(__import__("json").loads(o.strip().splitlines()[-1]))
|
|
128
|
+
except Exception:
|
|
129
|
+
res.append({"i": -1, "verdict": "ERR " + e.strip()[-120:]})
|
|
130
|
+
return res, _policy_body(root)
|
|
131
|
+
|
|
132
|
+
|
|
133
|
+
def group_a1():
|
|
134
|
+
print('== A1:4 进程并发 MERGE 到同一目标(加宽窗口)==')
|
|
135
|
+
res, body = _round("a1")
|
|
136
|
+
ok = [r["i"] for r in res if r.get("verdict") == "MERGE"]
|
|
137
|
+
miss = [i for i in ok if "VAL%04d" % (7000 + i) not in body]
|
|
138
|
+
print(" verdicts=%s 丢失=%s" % ([r.get("verdict") for r in res], miss))
|
|
139
|
+
_check('A1a 全部写者都回执 MERGE(前提成立,否则本腿无效)',
|
|
140
|
+
len(ok) == 4, [r.get("verdict") for r in res])
|
|
141
|
+
_check('A1b 已回执 MERGE 的新值 100% 在目标正文里(丢失 0)',
|
|
142
|
+
len(ok) == 4 and not miss, miss)
|
|
143
|
+
|
|
144
|
+
|
|
145
|
+
def group_a2():
|
|
146
|
+
print('== A2:连跑 2 轮(判据稳定,不是单轮偶然)==')
|
|
147
|
+
lost = 0
|
|
148
|
+
for _ in range(2):
|
|
149
|
+
res, body = _round("a2")
|
|
150
|
+
ok = [r["i"] for r in res if r.get("verdict") == "MERGE"]
|
|
151
|
+
lost += len([i for i in ok if "VAL%04d" % (7000 + i) not in body])
|
|
152
|
+
_check('A2 两轮合计丢失 0', lost == 0, lost)
|
|
153
|
+
|
|
154
|
+
|
|
155
|
+
def group_k1():
|
|
156
|
+
print('== K1:串行 MERGE 仍追加(锁不吞聚合、不卡死)==')
|
|
157
|
+
t = tempfile.mkdtemp(prefix="i348b_k1_")
|
|
158
|
+
root = os.path.join(t, "root")
|
|
159
|
+
env = _env(t, root)
|
|
160
|
+
old = dict(os.environ)
|
|
161
|
+
try:
|
|
162
|
+
os.environ.update({k: v for k, v in env.items()
|
|
163
|
+
if k.startswith(("MDCG_", "HOME"))})
|
|
164
|
+
from md_cg.mdcos import MdCGOS
|
|
165
|
+
cg = MdCGOS(root)
|
|
166
|
+
cg.add("policy", BASE, layer="contextual")
|
|
167
|
+
r1 = cg.remember_gated(None, BASE + "\nVAL7001", layer="contextual",
|
|
168
|
+
role="user")
|
|
169
|
+
r2 = cg.remember_gated(None, BASE + "\nVAL7002", layer="contextual",
|
|
170
|
+
role="user")
|
|
171
|
+
got = cg.get("policy") or {}
|
|
172
|
+
cg.close()
|
|
173
|
+
finally:
|
|
174
|
+
os.environ.clear()
|
|
175
|
+
os.environ.update(old)
|
|
176
|
+
body = got.get("content") or ""
|
|
177
|
+
_check('K1 串行两次 MERGE 都回执 MERGE 且两值都在正文',
|
|
178
|
+
r1.get("verdict") == "MERGE" and r2.get("verdict") == "MERGE"
|
|
179
|
+
and "VAL7001" in body and "VAL7002" in body,
|
|
180
|
+
(r1.get("verdict"), r2.get("verdict"), body[-120:]))
|
|
181
|
+
|
|
182
|
+
|
|
183
|
+
def _src(rel):
|
|
184
|
+
with open(os.path.join(_REPO, rel), encoding="utf-8") as f:
|
|
185
|
+
return f.read()
|
|
186
|
+
|
|
187
|
+
|
|
188
|
+
def group_e():
|
|
189
|
+
print('== E 组:结构锚(fail-closed)==')
|
|
190
|
+
fs = _src("md_cg/fsutil.py")
|
|
191
|
+
mo = _src("md_cg/mdcos.py")
|
|
192
|
+
_check('E1 merge_rmw_lock 走 FileLock 且 strict=True',
|
|
193
|
+
"def merge_rmw_lock" in fs and "strict=True" in fs
|
|
194
|
+
and "FileLock(" in fs)
|
|
195
|
+
# 六个落点(remember_gated 的 MERGE/CONVERGE、maintain prefeed、变更单执行
|
|
196
|
+
# 的两原语、审核 accept 的 merge 支)都必须出现 `with merge_rmw_lock(self):`。
|
|
197
|
+
# 判据是「整次原语调用被这一行包住」——用原文片段钉(不靠行号)。
|
|
198
|
+
_check('E2 remember_gated CONVERGE 支在 merge_rmw_lock 内',
|
|
199
|
+
"with merge_rmw_lock(self):" + NL + " _conv = "
|
|
200
|
+
"writelimit.converge_into(" in mo)
|
|
201
|
+
_check('E3a remember_gated MERGE 支在 merge_rmw_lock 内',
|
|
202
|
+
"with merge_rmw_lock(self):" + NL + " "
|
|
203
|
+
'out["reinforced"] = forgetting.reinforce(' in mo)
|
|
204
|
+
_check('E3b maintain prefeed 的 reinforce 在 merge_rmw_lock 内',
|
|
205
|
+
"with merge_rmw_lock(self):" + NL + " "
|
|
206
|
+
'out["reinforced"] = forgetting.reinforce(' in mo)
|
|
207
|
+
_check('E3c 变更单执行(B 合并)两原语都在 merge_rmw_lock 内',
|
|
208
|
+
"with merge_rmw_lock(self):" + NL + " res = "
|
|
209
|
+
"writelimit.converge_into(self, tgt, after," in mo
|
|
210
|
+
and "with merge_rmw_lock(self):" + NL + " res = "
|
|
211
|
+
"forgetting.reinforce(self, tgt, override=_ovr," in mo)
|
|
212
|
+
_check('E3d 六处落点齐全(计数口径,防只改一半)',
|
|
213
|
+
mo.count("with merge_rmw_lock(self):") == 6,
|
|
214
|
+
mo.count("with merge_rmw_lock(self):"))
|
|
215
|
+
# 精确绑定审核 merge 支:从 `else: # merge` 起的切片里必须出现锁行
|
|
216
|
+
# (M2 把它换成 `if True:` 时该切片内不再有锁 ⇒ E4 单独转红)。
|
|
217
|
+
_seg4 = mo.split("else: # merge", 1)[1][:3000] if "else: # merge" in mo else ""
|
|
218
|
+
_check('E4 审核 accept 的 merge 支整段在 merge_rmw_lock 内',
|
|
219
|
+
"with merge_rmw_lock(self):" in _seg4)
|
|
220
|
+
|
|
221
|
+
|
|
222
|
+
def main():
|
|
223
|
+
print('== #348-B 守卫 ==')
|
|
224
|
+
try:
|
|
225
|
+
group_a1()
|
|
226
|
+
group_a2()
|
|
227
|
+
group_k1()
|
|
228
|
+
except Exception as e:
|
|
229
|
+
import traceback
|
|
230
|
+
traceback.print_exc()
|
|
231
|
+
_check('A/K 组内异常(fail-closed)', False, str(e)[:150])
|
|
232
|
+
group_e()
|
|
233
|
+
print('=' * 62)
|
|
234
|
+
print('#348-B 守卫:%d 通过,%d 失败' % (len(PASSED), len(FAILS)))
|
|
235
|
+
for f in FAILS:
|
|
236
|
+
print(' 红项:' + f)
|
|
237
|
+
return 0 if not FAILS else 1
|
|
238
|
+
|
|
239
|
+
|
|
240
|
+
def _mirror():
|
|
241
|
+
"""镜像树:md_cg 包 + 仓根一级模块 + data/policy.json(写链的包内默认策略)。"""
|
|
242
|
+
d = tempfile.mkdtemp(prefix="i348b_mirror_")
|
|
243
|
+
shutil.copytree(os.path.join(_REPO, "md_cg"),
|
|
244
|
+
os.path.join(d, "md_cg"),
|
|
245
|
+
ignore=shutil.ignore_patterns("__pycache__", "*.pyc"))
|
|
246
|
+
for fn in os.listdir(_REPO):
|
|
247
|
+
if fn.endswith(".py") and os.path.isfile(os.path.join(_REPO, fn)):
|
|
248
|
+
shutil.copy2(os.path.join(_REPO, fn), os.path.join(d, fn))
|
|
249
|
+
src_pol = os.path.join(_REPO, "data", "policy.json")
|
|
250
|
+
if os.path.exists(src_pol):
|
|
251
|
+
os.makedirs(os.path.join(d, "data"), exist_ok=True)
|
|
252
|
+
shutil.copy2(src_pol, os.path.join(d, "data", "policy.json"))
|
|
253
|
+
return d
|
|
254
|
+
|
|
255
|
+
|
|
256
|
+
def _run_in(tree):
|
|
257
|
+
p = subprocess.run([sys.executable, "-X", "utf8", "-m",
|
|
258
|
+
"md_cg.test_issue348_merge_rmw_lock"],
|
|
259
|
+
cwd=tree, capture_output=True, text=True, timeout=2400,
|
|
260
|
+
encoding="utf-8", errors="replace",
|
|
261
|
+
env=dict({k: v for k, v in os.environ.items()
|
|
262
|
+
if not k.startswith("PYTHON")},
|
|
263
|
+
PYTHONPATH=tree, PYTHONUTF8="1"))
|
|
264
|
+
reds = [ln.strip().split(" ", 1)[0].replace("FAIL ", "")
|
|
265
|
+
for ln in p.stdout.splitlines() if ln.strip().startswith("FAIL ")]
|
|
266
|
+
return p.returncode, reds, p.stdout + p.stderr
|
|
267
|
+
|
|
268
|
+
|
|
269
|
+
_MUTATIONS = [
|
|
270
|
+
# M1:把 remember_gated MERGE 支的锁换成 `if True:`(缩进不变 ⇒ 只撤互斥,
|
|
271
|
+
# 不改语义分支)——并发腿 A1b/A2 必须转红,结构锚 E3a 一并转红。
|
|
272
|
+
("M1 撤 remember_gated MERGE 支的跨进程锁",
|
|
273
|
+
[("md_cg/mdcos.py",
|
|
274
|
+
" with merge_rmw_lock(self):" + NL +
|
|
275
|
+
" out[\"reinforced\"] = forgetting.reinforce(",
|
|
276
|
+
" if True:" + NL +
|
|
277
|
+
" out[\"reinforced\"] = forgetting.reinforce(")],
|
|
278
|
+
("A1b", "A2", "E3a", "E3d")),
|
|
279
|
+
# M2:审核 accept 的 merge 支同款撤锁。
|
|
280
|
+
("M2 撤审核 accept 的 merge 支锁",
|
|
281
|
+
[("md_cg/mdcos.py",
|
|
282
|
+
" with merge_rmw_lock(self):" + NL +
|
|
283
|
+
" target = merge_into or "
|
|
284
|
+
"(item.get(\"extra\") or {}).get(\"merge_into\")",
|
|
285
|
+
" if True:" + NL +
|
|
286
|
+
" target = merge_into or "
|
|
287
|
+
"(item.get(\"extra\") or {}).get(\"merge_into\")")],
|
|
288
|
+
("E4", "E3d")),
|
|
289
|
+
]
|
|
290
|
+
|
|
291
|
+
def _mutate():
|
|
292
|
+
print('!! 定点变异自证:把锁撤掉,守卫必须转红')
|
|
293
|
+
tree = _mirror()
|
|
294
|
+
try:
|
|
295
|
+
rc, reds, out = _run_in(tree)
|
|
296
|
+
print(' 未变异镜像基线:rc=%d 红项=%d(须 rc=0/0 红)' % (rc, len(reds)))
|
|
297
|
+
if rc != 0 or reds:
|
|
298
|
+
print(chr(10).join(out.splitlines()[-25:]))
|
|
299
|
+
bad = []
|
|
300
|
+
for desc, edits, exp in _MUTATIONS:
|
|
301
|
+
backups = []
|
|
302
|
+
miss = []
|
|
303
|
+
for rel, oldp, newp in edits:
|
|
304
|
+
p = os.path.join(tree, rel)
|
|
305
|
+
with open(p, encoding="utf-8", newline="") as f:
|
|
306
|
+
t = f.read()
|
|
307
|
+
if t.count(oldp) != 1:
|
|
308
|
+
miss.append("%s 命中 %d 次" % (rel, t.count(oldp)))
|
|
309
|
+
continue
|
|
310
|
+
backups.append((p, t))
|
|
311
|
+
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
312
|
+
f.write(t.replace(oldp, newp, 1))
|
|
313
|
+
if miss:
|
|
314
|
+
bad.append("%s —— %s" % (desc, ";".join(miss)))
|
|
315
|
+
print(' ANCHOR-MISS ' + desc)
|
|
316
|
+
for p, t in backups:
|
|
317
|
+
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
318
|
+
f.write(t)
|
|
319
|
+
continue
|
|
320
|
+
rc2, reds2, out2 = _run_in(tree)
|
|
321
|
+
for p, t in backups:
|
|
322
|
+
with open(p, "w", encoding="utf-8", newline="") as f:
|
|
323
|
+
f.write(t)
|
|
324
|
+
hit = sorted({e for r in reds2 for e in exp
|
|
325
|
+
if r.startswith(e)})
|
|
326
|
+
if rc2 != 0 and hit == sorted(exp):
|
|
327
|
+
print(' OK %s 红项=%s' % (desc, reds2))
|
|
328
|
+
else:
|
|
329
|
+
bad.append(desc)
|
|
330
|
+
print(' MISMATCH %s rc=%d 红项=%s' % (desc, rc2, reds2))
|
|
331
|
+
print(chr(10).join(out2.splitlines()[-20:]))
|
|
332
|
+
print('定点变异自证:%s(%d 条不合格)'
|
|
333
|
+
% ('PASS' if not bad else 'FAIL', len(bad)))
|
|
334
|
+
for b in bad:
|
|
335
|
+
print(' 不合格:' + b)
|
|
336
|
+
_check('变异自证全过', not bad, bad)
|
|
337
|
+
finally:
|
|
338
|
+
shutil.rmtree(tree, ignore_errors=True)
|
|
339
|
+
|
|
340
|
+
|
|
341
|
+
if __name__ == '__main__':
|
|
342
|
+
if '--mutate' in sys.argv:
|
|
343
|
+
_mutate()
|
|
344
|
+
sys.exit(0 if not FAILS else 1)
|
|
345
|
+
sys.exit(main())
|