Skip to content

Commit 011b7e3

Browse files
committed
Fix tests
1 parent 29aabe5 commit 011b7e3

File tree

4 files changed

+31
-2
lines changed

4 files changed

+31
-2
lines changed

e2e-tests/demand-backup-physical-sharded/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ run_recovery_check() {
2929
local backup_name=$1
3030
local compare_suffix=${2:-"_restore"}
3131

32-
wait_restore "${backup_name}" "${cluster}" "requested" "0" "600"
32+
wait_restore "${backup_name}" "${cluster}" "requested" "0" "900"
3333
echo
3434

3535
compare_kubectl "statefulset/${cluster}-rs0" ${compare_suffix}

e2e-tests/init-deploy/compare/backup-44.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -388,6 +388,7 @@
388388
},
389389
"actions": [
390390
"appendOplogNote",
391+
"applyOps",
391392
"checkFreeMonitoringStatus",
392393
"connPoolStats",
393394
"forceUUID",

e2e-tests/init-deploy/compare/clusterAdmin-44.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,23 @@
142142
"update"
143143
]
144144
},
145+
{
146+
"resource": {
147+
"db": "local",
148+
"collection": "system.healthlog"
149+
},
150+
"actions": [
151+
"changeStream",
152+
"collStats",
153+
"dbHash",
154+
"dbStats",
155+
"find",
156+
"killCursors",
157+
"listCollections",
158+
"listIndexes",
159+
"planCacheRead"
160+
]
161+
},
145162
{
146163
"resource": {
147164
"db": "local",
@@ -228,6 +245,14 @@
228245
"unlock",
229246
"useUUID"
230247
]
248+
},
249+
{
250+
"resource": {
251+
"anyResource": true
252+
},
253+
"actions": [
254+
"dbCheck"
255+
]
231256
}
232257
]
233258
}

e2e-tests/pitr-physical/run

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,10 @@ check_recovery() {
6969
| if [ -z "$restore_date" ]; then $sed -e "/date:/d"; else $sed -e "s/date:/date: $restore_date/"; fi \
7070
| kubectl_bin apply -f -
7171

72-
wait_restore "$backup_name" "$cluster_name" "ready" "0" "1200"
72+
# fail faster if we don't reach requested status until some time
73+
wait_restore "$backup_name" "$cluster_name" "requested" "0" "900"
74+
echo
75+
wait_restore "$backup_name" "$cluster_name" "ready" "0" "900"
7376
echo
7477
set -o xtrace
7578

0 commit comments

Comments
 (0)