Skip to content

Commit aaf7cf6

Browse files
K8SPS-505 fix demand-backup-retry test robustness (#1149)
* Fix test robustness * Add more improvements --------- Co-authored-by: Viacheslav Sarzhan <slava.sarzhan@percona.com>
1 parent c831c7b commit aaf7cf6

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

e2e-tests/functions

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ run_mysql_query_file() {
707707
wait_pod $client_pod 1>&2
708708

709709
cat "$file" | kubectl -n "${NAMESPACE}" exec -i "${pod:-mysql-client}" -- \
710-
bash -c "mysql -sN $host $user" 2>&1 | \
710+
bash -c "mysql -sN $host $user 2>&1" 2>/dev/null | \
711711
grep -v 'Using a password on the command line interface can be insecure.' || :
712712
}
713713

e2e-tests/tests/demand-backup-retry/02-create-cluster.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ commands:
1616
| yq eval ".spec.proxy.haproxy.size=3" - \
1717
| yq eval ".spec.orchestrator.enabled=true" - \
1818
| yq eval ".spec.orchestrator.size=3" - \
19-
| yq eval ".spec.backup.backoffLimit=3" - \
2019
| yq eval '.spec.backup.storages.minio.type="s3"' - \
2120
| yq eval '.spec.backup.storages.minio.s3.bucket="operator-testing"' - \
2221
| yq eval '.spec.backup.storages.minio.s3.credentialsSecret="minio-secret"' - \

e2e-tests/tests/demand-backup-retry/03-populate-database.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ commands:
1414
(.spec.template.spec.containers[].env[] | select(.name == \"MYSQL_HOST\")).value = \"${cluster_name}-haproxy\" |
1515
(.spec.template.spec.containers[].env[] | select(.name == \"MYSQL_PASSWORD\")).valueFrom.secretKeyRef.name = \"${cluster_name}-secrets\" |
1616
(.spec.template.spec.containers[].env[] | select(.name == \"MYSQL_DB\")).value = \"myDB\" |
17-
(.spec.template.spec.containers[].env[] | select(.name == \"TABLE_NUMBER\")).value = \"100\" |
17+
(.spec.template.spec.containers[].env[] | select(.name == \"TABLE_NUMBER\")).value = \"130\" |
1818
(.spec.template.spec.containers[].env[] | select(.name == \"TABLE_SIZE\")).value = \"50000\" |
1919
.
2020
" ../../conf/sysbench-oltp-write.yaml | kubectl apply -n "${NAMESPACE}" -f -

e2e-tests/tests/demand-backup-retry/07-assert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: kuttl.dev/v1beta1
22
kind: TestAssert
3-
timeout: 30
3+
timeout: 120
44
---
55
apiVersion: batch/v1
66
kind: Job

e2e-tests/tests/demand-backup-retry/09-assert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: kuttl.dev/v1beta1
22
kind: TestAssert
3-
timeout: 500
3+
timeout: 600
44
---
55
apiVersion: ps.percona.com/v1
66
kind: PerconaServerMySQL

e2e-tests/tests/demand-backup-retry/conf/data-query.sql

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
USE myDB;
2-
SET SESSION net_read_timeout = 60;
2+
3+
SET SESSION max_allowed_packet = 1073741824;
4+
35
DROP PROCEDURE IF EXISTS count_rows;
46

57
DELIMITER $$

0 commit comments

Comments
 (0)