open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2026-09-23 12:05:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ql3): bind upgrade plans to canonical paths

Browse Source
This commit is contained in:
whyour
2026-08-30 22:46:51 +08:00
parent 93b45ca62d
commit 6edf6ff3c5
2 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/templates/ql3-local-alpha-upgrade-readiness.sh
+3 -3
View File
@@ -70,10 +70,10 @@ mkdir -m 0700 "$evidence_root"
mkdir -m 0700 "$evidence_root/results" mkdir -m 0700 "$evidence_root/results"
cat >"$evidence_root/sqlite-inspect.json" <<EOF cat >"$evidence_root/sqlite-inspect.json" <<EOF
{"schemaVersion":1,"operation":"local-sqlite.adoption.inspect","options":{"deploymentRoot":"/var/lib/qinglong3","profile":"$profile","sourcePath":"/var/lib/qinglong2/db/database.sqlite"}} {"schemaVersion":1,"operation":"local-sqlite.adoption.inspect","options":{"deploymentRoot":"/var/lib/qinglong3","profile":"$profile","sourcePath":"$legacy_root/db/database.sqlite"}}
EOF EOF
cat >"$evidence_root/data-directory-inspect.json" <<EOF cat >"$evidence_root/data-directory-inspect.json" <<EOF
{"schemaVersion":1,"operation":"local-data-directory.adoption.inspect","options":{"dataRoot":"/var/lib/qinglong2","profile":"$profile"}} {"schemaVersion":1,"operation":"local-data-directory.adoption.inspect","options":{"dataRoot":"$legacy_root","profile":"$profile"}}
EOF EOF
chmod 0600 "$evidence_root/sqlite-inspect.json" "$evidence_root/data-directory-inspect.json" chmod 0600 "$evidence_root/sqlite-inspect.json" "$evidence_root/data-directory-inspect.json"
@@ -86,7 +86,7 @@ run_inspect() {
--cap-drop ALL --security-opt no-new-privileges \ --cap-drop ALL --security-opt no-new-privileges \
--memory 128m --memory-swap 128m --cpus 0.5 --pids-limit 32 \ --memory 128m --memory-swap 128m --cpus 0.5 --pids-limit 32 \
--tmpfs /tmp:rw,nosuid,nodev,noexec,size=8m \ --tmpfs /tmp:rw,nosuid,nodev,noexec,size=8m \
--mount "type=bind,src=$legacy_root,dst=/var/lib/qinglong2,readonly" \ --mount "type=bind,src=$legacy_root,dst=$legacy_root,readonly" \
--mount "type=bind,src=$evidence_root,dst=/var/lib/qinglong3" \ --mount "type=bind,src=$evidence_root,dst=/var/lib/qinglong3" \
"$OPERATOR_IMAGE" adoption run \ "$OPERATOR_IMAGE" adoption run \
--command-file "/var/lib/qinglong3/$command_file" \ --command-file "/var/lib/qinglong3/$command_file" \
test/back/ql3LocalAlphaTrialKitBundle.test.cjs
+19 -1
View File
@@ -568,7 +568,25 @@ exit 1
'inspected', 'inspected',
); );
const calls = fs.readFileSync(dockerLog, 'utf8'); const calls = fs.readFileSync(dockerLog, 'utf8');
assert.match(calls, /dst=\/var\/lib\/qinglong2,readonly/); assert.match(
calls,
new RegExp(`src=${legacyRoot},dst=${legacyRoot},readonly`),
);
assert.equal(
JSON.parse(
fs.readFileSync(path.join(evidenceRoot, 'sqlite-inspect.json'), 'utf8'),
).options.sourcePath,
path.join(legacyRoot, 'db', 'database.sqlite'),
);
assert.equal(
JSON.parse(
fs.readFileSync(
path.join(evidenceRoot, 'data-directory-inspect.json'),
'utf8',
),
).options.dataRoot,
legacyRoot,
);
assert.match(calls, /--network none/); assert.match(calls, /--network none/);
assert.match(calls, /--memory 128m --memory-swap 128m/); assert.match(calls, /--memory 128m --memory-swap 128m/);
assert.doesNotMatch(calls, /adoption\.stage|activation\.prepare|cutover/); assert.doesNotMatch(calls, /adoption\.stage|activation\.prepare|cutover/);