Change 32778
v3.1.0: Fix Phase 16b error count; fix setup_lab.sh filter bugs (Bug K)
trim_excess_metadata.sh:
- Phase 16b: change errmsg->msg for spec depot journal patch fallback,
consistent with Phase 17b behavior for other depots. Snap run now
correctly exits 4 (shelved CLs only) not 5.
test/setup_lab.sh:
- Bug K fix: Phase 3 idempotency grep matched empty RevisionDataFilter
field always present in p4 server spec templates, causing filter to
never be set. New check tests for actual tab-indented path values.
- Bug K fix: Filter insertion changed from append (broken — p4 ignored
appended duplicate fields) to sed in-place replacement.
- Phase 9: Added p4 verify -q //depot/... step (no-op on FFR but
documents the intent; backing archives pulled by p4verify.sh via
db.storage references).
Full end-to-end validation results (all depot types):
- remote depot: p4 depot -d (no -f) OK
- unload depot: p4 depot -df OK
- spec depot: Phase 16b obliterate + journal patch fallback OK
- local/stream depots: snap + storage cleanup + journal patch OK
- Snap: 2 depots (jam, pb) snapped successfully, 0 failures
- Exit codes: dry=0, live=4, snap=4 (all expected)
- p4 verify //jam/... //pb/... = 0 MISSING after journal patch
Co-authored-by: Copilot <[email protected]>
trim_excess_metadata.sh:
- Phase 16b: change errmsg->msg for spec depot journal patch fallback,
consistent with Phase 17b behavior for other depots. Snap run now
correctly exits 4 (shelved CLs only) not 5.
test/setup_lab.sh:
- Bug K fix: Phase 3 idempotency grep matched empty RevisionDataFilter
field always present in p4 server spec templates, causing filter to
never be set. New check tests for actual tab-indented path values.
- Bug K fix: Filter insertion changed from append (broken — p4 ignored
appended duplicate fields) to sed in-place replacement.
- Phase 9: Added p4 verify -q //depot/... step (no-op on FFR but
documents the intent; backing archives pulled by p4verify.sh via
db.storage references).
Full end-to-end validation results (all depot types):
- remote depot: p4 depot -d (no -f) OK
- unload depot: p4 depot -df OK
- spec depot: Phase 16b obliterate + journal patch fallback OK
- local/stream depots: snap + storage cleanup + journal patch OK
- Snap: 2 depots (jam, pb) snapped successfully, 0 failures
- Exit codes: dry=0, live=4, snap=4 (all expected)
- p4 verify //jam/... //pb/... = 0 MISSING after journal patch
Co-authored-by: Copilot <[email protected]>