Skip to content

Commit 203d394

Browse files
authored
K8SPSMDB-980 - Add case in finalizer test for delete when rs0-0 (#1328)
is not primary
1 parent fbe0c9f commit 203d394

File tree

2 files changed

+26
-5
lines changed

2 files changed

+26
-5
lines changed

e2e-tests/finalizer/run

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,34 @@ test_dir=$(realpath "$(dirname "$0")")
99
create_infra "$namespace"
1010
cluster="some-name"
1111

12+
desc 'create secrets and start client'
13+
kubectl_bin apply \
14+
-f $conf_dir/secrets_with_tls.yml \
15+
-f $conf_dir/client.yml
16+
1217
apply_cluster "$test_dir/conf/$cluster.yml"
1318
desc 'check if all 3 Pods started'
1419
wait_for_running "$cluster-rs0" 3
15-
16-
kubectl_bin delete psmdb $cluster
20+
wait_for_running "$cluster-cfg" 3
21+
wait_cluster_consistency "${cluster}"
22+
23+
desc "Kill primary to elect new one and test cluster deletion when primary is not rs0-0"
24+
primary=$(get_mongo_primary "clusterAdmin:clusterAdmin123456@$cluster-rs0.$namespace" "$cluster")
25+
if [ "$primary" == "$cluster-rs0-0" ]; then
26+
kubectl_bin delete pods --grace-period=0 --force $primary
27+
wait_for_running "$cluster-rs0" 3
28+
wait_cluster_consistency "${cluster}"
29+
fi
30+
primary=$(get_mongo_primary "clusterAdmin:clusterAdmin123456@$cluster-rs0.$namespace" "$cluster")
31+
if [ "$primary" == "$cluster-rs0-0" ]; then
32+
echo "Primary is the same as before, something went wrong!"
33+
exit 1
34+
fi
35+
36+
kubectl_bin delete psmdb $cluster --wait=false
1737

1838
desc "Wait for delete cluster $cluster"
19-
wait_for_delete psmdb/$cluster
39+
wait_for_delete psmdb/$cluster 180
2040

2141
desc "Wait for delete PVCs"
2242
wait_for_delete pvc/mongod-data-$cluster-cfg-0

e2e-tests/functions

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,7 @@ wait_for_running() {
579579

580580
wait_for_delete() {
581581
local res="$1"
582+
local wait_time=${2:-60}
582583

583584
set +o xtrace
584585
echo -n "$res - "
@@ -587,7 +588,7 @@ wait_for_delete() {
587588
sleep 1
588589
echo -n .
589590
let retry+=1
590-
if [ $retry -ge 60 ]; then
591+
if [ $retry -ge $wait_time ]; then
591592
kubectl_bin logs ${OPERATOR_NS:+-n $OPERATOR_NS} $(get_operator_pod) \
592593
| grep -v 'level=info' \
593594
| grep -v 'level=debug' \
@@ -805,7 +806,7 @@ get_mongo_primary() {
805806
else
806807
kubectl_bin get service -o wide \
807808
| grep " ${endpoint/:*/} " \
808-
| awk '{print$1}'
809+
| awk '{print $1}'
809810
fi
810811
}
811812

0 commit comments

Comments
 (0)