mirror of
https://github.com/cozystack/cozystack.git
synced 2026-11-21 20:23:39 +09:00
test(clickhouse): reclaim the round-trip Backup by its name
The Altinity driver names the Backup after the BackupJob and adopts one that already exists under that name. The round-trip's cleanup deleted the Backup only through the BackupJob's status.backupRef, so a Backup whose BackupJob never recorded it survived, and the next run's BackupJob would have adopted it in place of a fresh backup. Both the cleanup and the preconditions now delete it by name; the preconditions ceiling grows to cover the extra wait. Assisted-by: LLM Signed-off-by: Alexey Artamonov <aleksei.artamonov@aenix.io>
This commit is contained in:
1 parent
a662198991
commit
cabe9a07e2
2 files changed
+39
-6
No files matched your search
@@ -91,3 +91,35 @@ restore() {
|
||||
}
|
||||
jq -e '.data.Corefile == ".:53 {\n errors\n}\n"' "$STUB/replaced.json" >/dev/null
|
||||
}
|
||||
|
||||
# The Altinity driver names the Backup after the BackupJob and adopts one that
|
||||
# already exists under that name, so a Backup left behind would stand in for
|
||||
# the next run's backup. It is reclaimed by name, whether or not the BackupJob
|
||||
# recorded it in status.backupRef.
|
||||
@test "the round-trip reclaims its Backup by name before and after the run" {
|
||||
suite=hack/e2e-chainsaw/clickhouse/chainsaw-test.yaml
|
||||
test='select(.metadata.name == "clickhouse-3-system-bucket-roundtrip") | .spec.steps[]'
|
||||
calls="$STUB/calls"
|
||||
# Nothing is left over from an earlier run, and no BackupJob recorded a
|
||||
# backupRef.
|
||||
cat >"$STUB/kubectl" <<'STUBEOF'
|
||||
#!/bin/bash
|
||||
echo "$*" >>"$STUB/calls"
|
||||
case "$*" in
|
||||
*" get secret "*) exit 1 ;;
|
||||
esac
|
||||
STUBEOF
|
||||
for selector in \
|
||||
'select(.name == "preconditions") | .try[].script.content' \
|
||||
'select(.name == "run") | .finally[] | select(.description == "system-bucket round-trip cleanup") | .script.content'; do
|
||||
: >"$calls"
|
||||
script=$(yq "$test | $selector" "$suite")
|
||||
[ -n "$script" ] || { echo "no script at: $selector" >&2; false; }
|
||||
PATH="$STUB:$PATH" NAMESPACE=tenant-root sh -c "$script"
|
||||
grep -qE '^-n tenant-root delete backup sysbucket-backup( |$)' "$calls" || {
|
||||
echo "the script at '$selector' does not delete Backup sysbucket-backup by name; kubectl calls:" >&2
|
||||
cat "$calls" >&2
|
||||
false
|
||||
}
|
||||
done
|
||||
}
|
||||
@@ -439,7 +439,7 @@ spec:
|
||||
- name: preconditions
|
||||
try:
|
||||
- script:
|
||||
timeout: 2m
|
||||
timeout: 3m
|
||||
content: |
|
||||
set -eu
|
||||
if kubectl -n "$NAMESPACE" get secret seaweedfs-s3-ingress-tls -o name >/dev/null 2>&1; then
|
||||
@@ -451,9 +451,11 @@ spec:
|
||||
exit 1
|
||||
fi
|
||||
# Fixed names in a persistent namespace: a leftover Succeeded job
|
||||
# would satisfy the waits in the run step without a new attempt.
|
||||
# would satisfy the waits in the run step without a new attempt, and
|
||||
# the driver adopts a leftover Backup of the BackupJob's name.
|
||||
kubectl -n "$NAMESPACE" delete restorejob sysbucket-restore --ignore-not-found --wait=true --timeout=30s
|
||||
kubectl -n "$NAMESPACE" delete backupjob sysbucket-backup --ignore-not-found --wait=true --timeout=30s
|
||||
kubectl -n "$NAMESPACE" delete backup sysbucket-backup --ignore-not-found --wait=true --timeout=60s
|
||||
kubectl -n "$NAMESPACE" delete secret cozy-backups-creds --ignore-not-found --wait=true --timeout=30s
|
||||
check:
|
||||
($error == null): true
|
||||
@@ -562,10 +564,9 @@ spec:
|
||||
timeout: 3m
|
||||
content: |
|
||||
set -eu
|
||||
backup=$(kubectl -n "$NAMESPACE" get backupjob sysbucket-backup --ignore-not-found -o jsonpath='{.status.backupRef.name}')
|
||||
kubectl -n "$NAMESPACE" delete restorejob sysbucket-restore --ignore-not-found --wait=true --timeout=30s
|
||||
kubectl -n "$NAMESPACE" delete backupjob sysbucket-backup --ignore-not-found --wait=true --timeout=30s
|
||||
if [ -n "$backup" ]; then
|
||||
kubectl -n "$NAMESPACE" delete backup "$backup" --ignore-not-found --wait=true --timeout=60s
|
||||
fi
|
||||
# The driver names the Backup after the BackupJob; by name it is
|
||||
# found even when status.backupRef was never written.
|
||||
kubectl -n "$NAMESPACE" delete backup sysbucket-backup --ignore-not-found --wait=true --timeout=60s
|
||||
kubectl -n "$NAMESPACE" delete secret e2e-system-bucket-s3-tls --ignore-not-found --wait=true --timeout=30s
|
||||
Reference in new issue
Block a user