Skip to content

Evenfire is an intelligence layer platform for running LLM agents that take real actions, on your infrastructure

TypeScript

test(e2e): upgrade the T5 Host without a repair step

Alfredo Lopeze3beb196780b
diff --git a/scripts/e2e/e2e-hcc-layout-upgrade.sh b/scripts/e2e/e2e-hcc-layout-upgrade.sh
index eb92f153b..e0f9d3230 100755
--- a/scripts/e2e/e2e-hcc-layout-upgrade.sh
+++ b/scripts/e2e/e2e-hcc-layout-upgrade.sh
@@ -7,15 +7,17 @@
# the profile between the two modes.
#
# main installs v0.11.0 (published images), seeds one Host per row, runs
-# deploy/scripts/host-layout-merge.sh inventory, repairs T5 with the
-# upgrade-note procedure (plan A7.44), upgrades to this head (images
+# deploy/scripts/host-layout-merge.sh inventory, upgrades to this
+# head with no manual step (the merge init supersedes the T5 split
+# database, plan A7.46; images
# built from this tree, database kept), then checks verify and the
# history of every row. Rows:
# T1 stateful;
# T2 stateless, active at the upgrade;
# T3 stateless, suspended at the upgrade (woken afterwards);
# T5 created stateless, used, switched to stateful by a
-# CommunicationChannel and used again (two live databases);
+# CommunicationChannel and used again (root database plus the
+# older state/ one, renamed by the merge init);
# T6 stateless -> stateful -> stateless.
# Prints E2E_UPGRADE_MAIN=PASS|FAIL and E2E_UPGRADE_HEAD=<sha>.
# control the negative control: CONTEXT_MAPPER_WORKSPACE_LAYOUT_MERGE=false
@@ -35,8 +37,7 @@
#
# Cluster writes besides the setups and the admin API: the named fixtures of
# e2e-hcc-storage-layout-switch.sh (hcc-cadence, pvc-fixture, channel,
-# host-layout-merge), the T5 repair (a pvc-fixture rename on the release, as the
-# upgrade note says) and, in control mode,
+# host-layout-merge) and, in control mode,
# FAULT:flag-false (kubectl set env on the HCC Deployment, undone in the
# trap). No kubectl exec into Host Pods, no SQLite reads or writes.
set -euo pipefail
@@ -166,12 +167,6 @@ HTTP_CODE='' HTTP_BODY='' HTTP_HEADERS=()
# shellcheck source=scripts/e2e/e2e-825-lib.sh
source "${SCRIPT_DIR}/e2e-825-lib.sh"
-F2='workspace layout merge refused: more than one live SQLite database across'
-# The upgrade note's repair for a T5 tree, keeping the chats since the switch:
-# the database family under state/ is renamed, never deleted.
-# shellcheck disable=SC2016 # expanded inside the fixture Pod
-REPAIR_STATE_FAMILY_SCRIPT='set -eu; cd "$1/state"; [ -f state.db ]
-for s in "" -wal -shm; do [ -e "state.db$s" ] || continue; mv "state.db$s" "state.db.upgrade-lane.bak$s"; done; ls -la'
# Seed files sit where the agent sees /workspace: the PVC root for a stateful
# Host, PVC/workspace for a stateless one on the old release.
# shellcheck disable=SC2016
@@ -404,31 +399,15 @@ seed_rows() {
predict_rows() {
run_layout inventory
- [ "$LAYOUT_RC" = 1 ] || { fail "inventory exited ${LAYOUT_RC}, expected 1 (T5 blocks): $(tail -n 3 "$LAYOUT_OUT" | tr '\n' ' ')"; return 1; }
- grep -qx 'UPGRADE_BLOCKERS=1' "$LAYOUT_OUT" || { fail "inventory: $(grep UPGRADE_BLOCKERS "$LAYOUT_OUT"), expected UPGRADE_BLOCKERS=1"; return 1; }
- expect_row "$HOST_T5" "WILL_REFUSE_F2 ${F2}*" 'inventory T5' &&
+ [ "$LAYOUT_RC" = 0 ] || { fail "inventory exited ${LAYOUT_RC}, expected 0: $(tail -n 3 "$LAYOUT_OUT" | tr '\n' ' ')"; return 1; }
+ grep -qx 'UPGRADE_BLOCKERS=0' "$LAYOUT_OUT" || { fail "inventory: $(grep UPGRADE_BLOCKERS "$LAYOUT_OUT"), expected UPGRADE_BLOCKERS=0"; return 1; }
+ expect_row "$HOST_T5" WILL_SUPERSEDE 'inventory T5' &&
expect_row "$HOST_T2" WILL_MERGE 'inventory T2' &&
expect_row "$HOST_T3" WILL_MERGE 'inventory T3' &&
expect_row "$HOST_T6" WILL_MERGE 'inventory T6' &&
expect_row "$HOST_T1" NO_SPLIT_SIGNATURE 'inventory T1'
}
-# The upgrade note's T5 repair, keeping the chats since the switch, on the
-# release: the running stateful Pod opens only the root database, so the
-# state/ family is renamed while it serves. Repaired before the upgrade
-# because make minikube-setup waits for every Host rollout, and a Host left in
-# Init:Error by the merge fails it (sync-auth-key.sh).
-repair_blockers() {
- log "REPAIR:${HOST_T5} rename the state/ database family (upgrade note)"
- pvc_fixture "$HOST_T5" rw repair "$REPAIR_STATE_FAMILY_SCRIPT" >/dev/null || return 1
- run_layout inventory
- if [ "$LAYOUT_RC" != 0 ] || ! grep -qx 'UPGRADE_BLOCKERS=0' "$LAYOUT_OUT"; then
- fail "inventory after the repair exited ${LAYOUT_RC}: $(grep UPGRADE_BLOCKERS "$LAYOUT_OUT")"
- return 1
- fi
- expect_row "$HOST_T5" NO_SPLIT_SIGNATURE 'inventory after repair T5'
-}
-
check_upgraded() {
local host
wait_merge_templates "$HOST_T1" "$HOST_T2" "$HOST_T3" "$HOST_T5" "$HOST_T6" || return 1
@@ -462,15 +441,17 @@ check_history() {
ROWS_DONE=$((ROWS_DONE + 1))
assert_history "$HOST_T3" "upgrade(stateless-suspended)->wake" && read_seed_file "$HOST_T3" seed.txt "upgrade ${RUN} ${HOST_T3}" || return 1
ROWS_DONE=$((ROWS_DONE + 1))
- # T5 serves the root family it served before the upgrade; the old family is
- # kept as a backup, and its old files stay under workspace/ (no signature).
- assert_history "$HOST_T5" "repair(two-databases)->upgrade" || return 1
- listing="$(pvc_fixture "$HOST_T5" ro list-repaired "$LIST_SCRIPT")" || return 1
- grep -qx 'f ./state/state.db.upgrade-lane.bak' <<<"$listing" ||
- { fail "T5: the renamed family is missing: ${listing}"; return 1; }
+ # T5 serves the root family it served before the upgrade; the merge init
+ # renamed the older state/ to state.db.superseded-<ts>, and the old files
+ # stay under workspace/.
+ assert_history "$HOST_T5" "two-databases->upgrade(superseded)" || return 1
+ listing="$(pvc_fixture "$HOST_T5" ro list-superseded "$LIST_SCRIPT")" || return 1
+ grep -Eq '^f \./state\.db\.superseded-[0-9]{8}T[0-9]{6}Z/state\.db$' <<<"$listing" ||
+ { fail "T5: no state.db.superseded-*/state.db: ${listing}"; return 1; }
+ ! grep -Eq '^d \./state$' <<<"$listing" || { fail "T5: state/ still present: ${listing}"; return 1; }
[ "$(pvc_fixture "$HOST_T5" ro read-file "$READ_AT_SCRIPT" workspace seed.txt)" = "upgrade ${RUN} ${HOST_T5}" ] ||
{ fail 'T5: the old seed file is not under workspace/'; return 1; }
- ok 'T5: old family kept as state/state.db.upgrade-lane.bak, old files under workspace/'
+ ok 'T5: old database kept as state.db.superseded-*/state.db, old files under workspace/'
ROWS_DONE=$((ROWS_DONE + 1))
assert_history "$HOST_T6" "upgrade(stateless-stateful-stateless)" && read_seed_file "$HOST_T6" seed.txt "upgrade ${RUN} ${HOST_T6}" || return 1
ROWS_DONE=$((ROWS_DONE + 1))
@@ -480,7 +461,6 @@ run_main() {
header "Install ${RELEASE}" && install_release &&
header 'Seed rows on the release' && seed_rows &&
header 'Predict with inventory' && predict_rows &&
- header 'Repair blockers on the release' && repair_blockers &&
header 'Upgrade to this head' && upgrade_to_head &&
header 'Verify and wake' && check_upgraded &&
header 'History of every row' && check_history
diff --git a/scripts/e2e/e2e-hcc-storage-layout-switch.sh b/scripts/e2e/e2e-hcc-storage-layout-switch.sh
index 69335eaf2..c430cf345 100755
--- a/scripts/e2e/e2e-hcc-storage-layout-switch.sh
+++ b/scripts/e2e/e2e-hcc-storage-layout-switch.sh
@@ -126,7 +126,8 @@ ls -la state workspace'
# with workspace/ present so the tree carries the split-layout signature and
# a file under each directory the merge would move.
# shellcheck disable=SC2016
-SEED_TWO_DB_SCRIPT='set -eu; cd "$1"; mkdir state workspace; cp state.db state/state.db
+SEED_TWO_DB_SCRIPT='set -eu; cd "$1"; mkdir state workspace; [ -f state.db ]
+for s in "" -wal -shm; do [ -e "state.db$s" ] || continue; cp "state.db$s" "workspace/state.db$s"; mv "state.db$s" "state/state.db$s"; done
printf "notes\n" > state/notes.txt; printf "x\n" > workspace/x; ls -la . state workspace'
# A new stateless Host with history, a seeded file, then suspended.
@@ -305,8 +306,9 @@ scenario_S5() {
read_seed_file "$name" seed.txt "seed ${RUN}"
}
-# S6: two live database families: the merge refuses, the Pod stays in
-# Init:Error and the tree is unchanged.
+# S6: two live database families, under state/ and workspace/ with none at
+# the root (a T5 tree with a root database is superseded, not refused): the
+# merge refuses, the Pod stays in Init:Error and the tree is unchanged.
scenario_S6() {
local name before after list_before list_after elapsed=0 pod logs row
local f2='workspace layout merge refused: more than one live SQLite database across'
@@ -316,12 +318,14 @@ scenario_S6() {
before="$(pvc_fixture "$name" ro hash-before "$HASH_SCRIPT")" || return 1
list_before="$(pvc_fixture "$name" ro list-before "$LIST_SCRIPT")" || return 1
grep -q ' ./state/state.db$' <<<"$before" || { fail "S6 witness: state/state.db not seeded: ${before}"; return 1; }
+ grep -q ' ./workspace/state.db$' <<<"$before" || { fail "S6 witness: workspace/state.db not seeded: ${before}"; return 1; }
+ ! grep -qx 'f ./state.db' <<<"$list_before" || { fail "S6 witness: a root state.db remains: ${list_before}"; return 1; }
if ! grep -qx 'f ./state/notes.txt' <<<"$list_before" || ! grep -qx 'f ./workspace/x' <<<"$list_before"; then
fail "S6 witness: state/notes.txt or workspace/x not seeded: ${list_before}"
return 1
fi
- # The seeded tree is the T5 shape (root DB, state/state.db, workspace/):
- # inventory must name it as an upgrade blocker before the merge runs. Its
+ # inventory must name the seeded tree as an upgrade blocker before the merge
+ # runs. Its
# check Pod runs between the two hashes, so the comparison below also
# proves it changed nothing.
row="$(layout_row inventory "$name" 1)" || return 1
diff --git a/scripts/e2e/e2e-hcc-storage-layout-switch.test.mjs b/scripts/e2e/e2e-hcc-storage-layout-switch.test.mjs
index 6bab3b64c..1159c5ea6 100644
--- a/scripts/e2e/e2e-hcc-storage-layout-switch.test.mjs
+++ b/scripts/e2e/e2e-hcc-storage-layout-switch.test.mjs
@@ -415,17 +415,14 @@ test('the upgrade lane installs the release deploy tree and checks the CRDs', ()
assert.doesNotMatch(SOURCE, /this tree no longer installs the release/)
})
-// A7.44: make minikube-setup waits for every Host rollout, so a Host left in
-// Init:Error by the upgrade fails it. The lane repairs T5 on the release.
-test('the upgrade lane repairs blockers before it upgrades', () => {
+// A7.46: the merge init supersedes the T5 split database, so the lane runs no
+// repair step between the inventory and the upgrade.
+test('the upgrade lane upgrades without a repair step', () => {
const main = helper('run_main')
- const repair = main.indexOf('repair_blockers')
- const upgrade = main.indexOf('upgrade_to_head')
- assert.notEqual(repair, -1, 'run_main does not call repair_blockers')
- assert.notEqual(upgrade, -1, 'run_main does not call upgrade_to_head')
- assert.ok(repair < upgrade, 'repair_blockers runs after upgrade_to_head')
- assert.match(helper('repair_blockers'), /grep -qx 'UPGRADE_BLOCKERS=0'/)
- assert.doesNotMatch(helper('check_upgraded'), /wait_refused_pod|REPAIR_STATE_FAMILY_SCRIPT/)
+ // Witness: run_main is the lane's sequence and reaches the upgrade.
+ assert.notEqual(main.indexOf('upgrade_to_head'), -1, 'run_main does not call upgrade_to_head')
+ assert.doesNotMatch(SOURCE, /repair_blockers|REPAIR_STATE_FAMILY_SCRIPT/)
+ assert.doesNotMatch(helper('check_upgraded'), /wait_refused_pod/)
})
// A7.45: the head setup's seed (seed-e2e-data.sh put_agents) resets the user's
@@ -455,9 +452,7 @@ test('login_all regrant grants every created Host before it mints', () => {
assert.equal(plain.stdout.trim(), 'admin_login\nuser_login\nmint\nRC=0')
})
-test('the lane T5 repair leaves a tree the merge does not touch', () => {
- const repairScript = SOURCE.match(/^REPAIR_STATE_FAMILY_SCRIPT='([^']*)'/m)
- assert.ok(repairScript, 'REPAIR_STATE_FAMILY_SCRIPT not found')
+test('the lane T5 tree is classified as superseded, not refused', () => {
const layoutScript = fileURLToPath(new URL('../../deploy/scripts/host-layout-merge.sh', import.meta.url))
const root = mkdtempSync(path.join(tmpdir(), 'e2e-825-t5-repair-'))
try {
@@ -468,12 +463,11 @@ test('the lane T5 repair leaves a tree the merge does not touch', () => {
assert.equal(printed.status, 0, printed.stderr)
return spawnSync('/bin/sh', ['-c', printed.stdout], { encoding: 'utf8' }).stdout
}
- // Witness: the seeded tree is the T5 blocker.
- assert.match(classify(), /^WILL_REFUSE_F2 /)
- const repaired = spawnSync('/bin/sh', ['-c', repairScript[1], 'repair', root], { encoding: 'utf8' })
- assert.equal(repaired.status, 0, repaired.stderr)
- assert.equal(classify(), 'NO_SPLIT_SIGNATURE\n')
- assert.deepEqual(readdirSync(path.join(root, 'state')).sort(), ['state.db.upgrade-lane.bak', 'state.db.upgrade-lane.bak-wal'])
+ // Witness: the tree carries the signature and both database families.
+ assert.deepEqual(readdirSync(path.join(root, 'state')).sort(), ['state.db', 'state.db-wal'])
+ assert.equal(classify(), 'WILL_SUPERSEDE\n')
+ // The check is read-only: the tree is unchanged.
+ assert.deepEqual(readdirSync(root).sort(), ['state', 'state.db', 'workspace'])
assert.equal(readFileSync(path.join(root, 'state.db'), 'utf8'), 'state.db')
} finally {
rmSync(root, { recursive: true, force: true })