Skip to content

Commit fe66fcf

Browse files
committed
e2e: make external-dsc-etcd more resilient
1 parent 00565ed commit fe66fcf

4 files changed

Lines changed: 7 additions & 3 deletions

File tree

stackgres-k8s/e2e/spec/external-dcs-etcd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ check_external_dcs_two_clusters_is_working() {
112112
wait_pods_running "$CLUSTER_FAR_NAMESPACE" 2
113113
wait_cluster_external_dcs "$CLUSTER_FAR_NAME" "$CLUSTER_FAR_NAMESPACE" test false
114114

115-
CLUSTER_NAMESPACE="$CLUSTER_FAR_NAMESPACE" CLUSTER_NAME="$CLUSTER_FAR_NAME" CLUSTER_HOST="$CLUSTER_FAR_NAME-replicas" try_function check_mock_data_samehost "$CLUSTER_FAR_NAME"
115+
CLUSTER_NAMESPACE="$CLUSTER_FAR_NAMESPACE" CLUSTER_NAME="$CLUSTER_FAR_NAME" CLUSTER_HOST="$CLUSTER_FAR_NAME-replicas" try_function wait_until check_mock_data_samehost "$CLUSTER_FAR_NAME"
116116
if "$RESULT"
117117
then
118118
success "Cluster using external DCS is replicating from cluster using same DCS and scope and was able to read some data from replicas service"

stackgres-k8s/e2e/spec/previous/1.14/spec/external-dcs-etcd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ check_external_dcs_two_clusters_is_working() {
112112
wait_pods_running "$CLUSTER_FAR_NAMESPACE" 2
113113
wait_cluster_external_dcs "$CLUSTER_FAR_NAME" "$CLUSTER_FAR_NAMESPACE" test false
114114

115-
CLUSTER_NAMESPACE="$CLUSTER_FAR_NAMESPACE" CLUSTER_NAME="$CLUSTER_FAR_NAME" CLUSTER_HOST="$CLUSTER_FAR_NAME-replicas" try_function check_mock_data_samehost "$CLUSTER_FAR_NAME"
115+
CLUSTER_NAMESPACE="$CLUSTER_FAR_NAMESPACE" CLUSTER_NAME="$CLUSTER_FAR_NAME" CLUSTER_HOST="$CLUSTER_FAR_NAME-replicas" try_function wait_until check_mock_data_samehost "$CLUSTER_FAR_NAME"
116116
if "$RESULT"
117117
then
118118
success "Cluster using external DCS is replicating from cluster using same DCS and scope and was able to read some data from replicas service"

stackgres-k8s/e2e/spec/previous/1.15/spec/external-dcs-etcd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ check_external_dcs_two_clusters_is_working() {
112112
wait_pods_running "$CLUSTER_FAR_NAMESPACE" 2
113113
wait_cluster_external_dcs "$CLUSTER_FAR_NAME" "$CLUSTER_FAR_NAMESPACE" test false
114114

115-
CLUSTER_NAMESPACE="$CLUSTER_FAR_NAMESPACE" CLUSTER_NAME="$CLUSTER_FAR_NAME" CLUSTER_HOST="$CLUSTER_FAR_NAME-replicas" try_function check_mock_data_samehost "$CLUSTER_FAR_NAME"
115+
CLUSTER_NAMESPACE="$CLUSTER_FAR_NAMESPACE" CLUSTER_NAME="$CLUSTER_FAR_NAME" CLUSTER_HOST="$CLUSTER_FAR_NAME-replicas" try_function wait_until check_mock_data_samehost "$CLUSTER_FAR_NAME"
116116
if "$RESULT"
117117
then
118118
success "Cluster using external DCS is replicating from cluster using same DCS and scope and was able to read some data from replicas service"

stackgres-k8s/e2e/utils/cluster

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,10 @@ wait_cluster_external_dcs() {
165165
| wc -l)" -ge 1 ]'
166166
fi
167167
fi
168+
169+
wait_until eval 'kubectl exec -n "$NAMESPACE" "$RELEASE-0" -c patroni -- \
170+
psql -t -A -c "\du" \
171+
| grep -q "^authenticator|"'
168172
}
169173

170174
has_cluster_generated_resources() {

0 commit comments

Comments
 (0)