#!/bin/bash
set -u
# Version ID Block. Relies on +k filetype modifier.
#------------------------------------------------------------------------------
# shellcheck disable=SC2016
declare VersionID='$Id: //p4-sdp/r26.1.0.BETA/test/bsw/test_script-recover_edge_2.sh#1 $ $Change: 33444 $'
declare VersionStream=${VersionID#*//}; VersionStream=${VersionStream#*/}; VersionStream=${VersionStream%%/*};
declare VersionCL=${VersionID##*: }; VersionCL=${VersionCL%% *}
declare Version=${VersionStream}.${VersionCL}
[[ "$VersionStream" == r* ]] || Version="${Version^^}"
declare ThisScript="${0##*/}"
declare -i ErrorCount=0
declare -i Debug=${SDP_DEBUG:-0}
declare EdgeHost=p4-04
declare -i LocalLogCount=0
declare -a LocalLogList
declare -i EdgeLogCount=0
declare -a EdgeLogList
declare EdgeClientsFile=
declare UUID=
function msg () { echo -e "$*"; }
function dbg () { [[ "$Debug" -eq 0 ]] || msg "DEBUG: $*"; }
function errmsg () { msg "\\nError: ${1:-Unknown Error}\\n"; ErrorCount+=1; }
function bail () { errmsg "${1:-Unknown Error}"; exit "$ErrorCount"; }
msg "Start test [$ThisScript version $Version]: Do serial edge dump."
# Setup: Create site config dir if needed
mkdir -p /p4/common/site/config
ssh "$EdgeHost" mkdir -p /p4/common/site/config
msg "Configure for serial checkpoint ops on commit and edge."
{
echo export DO_PARALLEL_CHECKPOINTS=4
echo KEEPCKPS=2
echo KEEPJNLS=2
echo KEEPCKPS=2
} > /p4/common/site/config/p4_1.vars.local
rsync /p4/common/site/config/p4_1.vars.local "$EdgeHost":/p4/common/site/config/p4_1.vars.local ||\
errmsg "Failed to copy /p4/common/site/config/p4_1.vars.local."
msg "Create and flush clients on the edge."
UUID=$(uuidgen|cut -c1-6)
p4 -p p4-04:1999 login bruno
p4 -p p4-04:1999 -u bruno --field Root=/p4/1/tmp/Test1.$UUID client -S //jam/dev2.3 -o Test1.$UUID | p4 -s -p p4-04:1999 -u bruno client -i
p4 -p p4-04:1999 -u bruno -c Test1.$UUID flush -q
p4 -p p4-04:1999 -u bruno --field Root=/p4/1/tmp/Test2.$UUID client -S //jam/main -o Test2.$UUID | p4 -s -p p4-04:1999 -u bruno client -i
p4 -p p4-04:1999 -u bruno -c Test2.$UUID flush -q
msg "Rotate journal on commit."
rotate_journal.sh 1
LocalLogList[LocalLogCount]="/p4/1/logs/checkpoint.log"
LocalLogCount+=1
msg "Creating serial edge dump on commit."
msg "Running: edge_dump.sh 1 p4d_edge_syd"
edge_dump.sh 1 p4d_edge_syd
LocalLogList[LocalLogCount]="/p4/1/logs/edge_dump.log"
LocalLogCount+=1
msg "Copying /p4/1/checkpoints to edge server."
rsync -a /p4/1/checkpoints/ p4-04:/p4/1/checkpoints ||\
errmsg "Could not do: rsync -a /p4/1/checkpoints/ p4-04:/p4/1/checkpoints"
# Get the latest MD5 from the parallel dump just created above, which will
# end in *.md5. The checkpoint directory has the same name sans the .md5 suffix.
EdgeSeedMD5=$(ls -t /p4/1/checkpoints/p4_1.edge_syd.seed.*.md5 | head -1)
EdgeSeed="${EdgeSeedMD5%.md5}"
[[ -d "$EdgeSeed" ]] || errmsg "Could not find checkpoint directory: $EdgeSeed"
msg "\\nRunning: ssh $EdgeHost /p4/common/bin/recover_edge.sh 1 ${EdgeSeed}"
ssh "$EdgeHost" /p4/common/bin/recover_edge.sh 1 ${EdgeSeed} ||\
errmsg "Remote call to recover_edge.sh indicated an error."
EdgeLogList[EdgeLogCount]="/p4/1/logs/recover_edge.log"
EdgeLogCount+=1
msg "\\nChecking that clients created earlier are still here after recovery."
EdgeClientsFile=/p4/1/tmp/edge_clients.txt
p4 -p p4-04:1999 login bruno
p4 -p p4-04:1999 -u bruno clients > "$EdgeClientsFile"
cat "$EdgeClientsFile"
grep Test1.$UUID "$EdgeClientsFile" ||\
errmsg "Did not see client Test1.$UUID after edge recovery."
grep Test2.$UUID "$EdgeClientsFile" ||\
errmsg "Did not see client Test2.$UUID after edge recovery."
msg "Checking for syntax and unbound errors in scripts used in this test."
for log in "${LocalLogList[@]}"; do
msg "Checking for 'unbound variable' in: $log"
grep ':unbound variable' "$log" && \
errmsg "Found 'unbound variable' error in $log"
msg "Checking for 'syntax error' in: $log"
grep ':syntax error' "$log" && \
errmsg "Found 'syntax error' in $log"
done
msg "Checking for syntax and unbound errors in scripts used in this test on edge host."
for log in "${EdgeLogList[@]}"; do
msg "Checking for 'unbound variable' in: $EdgeHost:$log"
ssh -q "$EdgeHost" "grep ':unbound variable' $log" && \
errmsg "Found 'unbound variable' error in $log"
msg "Checking for 'syntax error' in: $EdgeHost:$log"
ssh -q "$EdgeHost" "grep ':syntax error' $log" && \
errmsg "Found 'syntax error' in $log"
done
exit "$ErrorCount"
| # | Change | User | Description | Committed | |
|---|---|---|---|---|---|
| #1 | 33444 | Claude (AI Agent by Anthropic) | Initial population of r26.1.0.BETA from main. | ||
| //p4-sdp/main/test/bsw/test_script-recover_edge_2.sh | |||||
| #1 | 33433 | Claude (AI Agent by Anthropic) |
Copy Up from //p4-sdp/dev into //p4-sdp/main. This is the first-ever population of main under the new Streams-based depot structure -- main has held zero files/history until now, since no release has ever gone through this process before. 463 files, covering the entire 2026.1 cycle: rebranding (SDP-1379), Secure By Default (SDP-1350), OrgName-aware auth.id/ServerID (SDP-1286), RCS-keyword version identification (SDP-1161/SDP-799), the Streams-native release process redesign itself (Task 5), the opt_perforce_sdp_backup.sh false-error fix, the P4D 2026.1 test-suite targeting, refreshed P4*.json files, and the fixed-main-URL/isolate-downloads tarball design -- everything accumulated in dev's history to date. Isolated paths (ai_dev_support/, Version, doc/*.html, doc/*.pdf, doc/gen/*.man.txt, doc/gen/sdp_install.cfg, Unsupported/doc/*.html, Unsupported/doc/*.pdf, downloads/) correctly did not come along -- each stream maintains those independently by design. Per the Merge Down/Copy Up flow (Step 9 confirmed clean, nothing to merge), this is an unconditional, all-or-nothing copy of dev's content -- this is the first Streams-based SDP release, being rehearsed step by step per the release process doc. Agent: Claude Code, Model: Claude Sonnet 5 (claude-sonnet-5), operating as bot_Claude_Anthropic. |
||
| //p4-sdp/dev/test/bsw/test_script-recover_edge_2.sh | |||||
| #3 | 33409 | Claude (AI Agent by Anthropic) |
Copy Up from //p4-sdp/dev_rebrand into //p4-sdp/dev. This is the first promotion of dev_rebrand's work into dev since dev_rebrand was created (2025-05-24) -- 303 files, covering the entire 2026.1 rebranding effort (SDP-1379), the Secure By Default adaptation (SDP-1350), OrgName-aware auth.id/ServerID (SDP-1286), RCS-keyword version identification (SDP-1161/SDP-799), and the Streams-native release process redesign (Task 5) done this session, plus everything else accumulated in dev_rebrand's history before this session. Per the Merge Down/Copy Up flow, this is intentionally a full, unconditional blast-replace of dev's content from dev_rebrand -- all selectivity/care happened in the preceding Merge Down (dev -> dev_rebrand, changes 33407-33408), which absorbed Robert Cowham's independent dev-side work first so nothing of his is lost by this Copy Up. Two files are worth calling out since they might look alarming in isolation: - tools/mdcu.sh is deleted -- intentional, retired this session in favor of the two direct Streams commands now documented in doc/ReleaseProcessOverview.md. - tools/ReleaseProcessOverview.md is deleted -- this is a stale relic of a file move dev_rebrand made back in 2025-05-24 (tools/ -> doc/) that was never previously propagated to dev; the current, fully-rewritten doc/ReleaseProcessOverview.md is added/updated correctly by this same changelist. |
||
| #2 | 31574 | C. Thomas Tyler |
Merged SDP 2024.2 Patch 4 from Classic to Streams. p4 merge -b SDP_Classic_to_Streams |
||
| #1 | 31397 | C. Thomas Tyler | Populate -b SDP_Classic_to_Streams -s //guest/perforce_software/sdp/...@31368. | ||
| //guest/perforce_software/sdp/dev/test/bsw/test_script-recover_edge_2.sh | |||||
| #1 | 30649 | C. Thomas Tyler |
Added more tests for recover_edge.sh and related scripts, and improved auditability the first test script for recover_edge.sh. |
||