Skip to content

Commit c1949eb

Browse files
teoincontattoteoincontatto
committed
Merge branch '2899-patroni-configuration-for-backups-interfere-with-standby-cluster' into 'main'
🚆 Merge Train 2024-10-11 Closes #2899, #2896, #2901, #2881, #2871, #2844, #2842, and #2807 See merge request ongresinc/stackgres!1614
2 parents 5e28690 + 580928d commit c1949eb

103 files changed

Lines changed: 613 additions & 493 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎doc/content/en/06-crd-reference/14-sgshardeddbops/_index.template.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ spec:
3232
op: restart
3333
maxRetries: 1
3434
restart:
35-
mode: InPlace
35+
method: InPlace
3636
```
3737
3838
{{% include "generated/SGShardedDbOps.md" %}}

‎stackgres-k8s/e2e/spec/abstract/backup‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ rotate_wal_file() {
3939
local CURRENT_WAL_FILE
4040
CURRENT_WAL_FILE="$(get_current_wal_file "$1")"
4141
wait_until eval '[ "$(kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-"$NODE" -c postgres-util -- \
42-
psql -t -A -p 5432 \
42+
psql -q -t -A -p 5432 \
4343
-c "CHECKPOINT" \
4444
-c "SELECT r.file_name from pg_walfile_name_offset(pg_switch_wal()) as r")" != "$CURRENT_WAL_FILE" ]' >&2
4545
printf '%s' "$CURRENT_WAL_FILE"
@@ -48,7 +48,7 @@ rotate_wal_file() {
4848
get_current_wal_file() {
4949
local NODE="${1:-0}"
5050
kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-"$NODE" -c postgres-util -- \
51-
psql -t -A -p 5432 -c \
51+
psql -q -t -A -p 5432 -c \
5252
'SELECT r.file_name from pg_walfile_name_offset(pg_current_wal_lsn()) as r'
5353
}
5454

‎stackgres-k8s/e2e/spec/abstract/dbops-major-version-upgrade‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ reset_cluster_internal() {
107107

108108
if [ "$ONLY_PG_REPACK" != true ] && [ -n "$SOURCE_POSTGIS_VERSION" ] && [ "$SOURCE_POSTGIS_VERSION" = "$TARGET_POSTGIS_VERSION" ]
109109
then
110-
kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -c postgres-util -- psql -c "$(cat << 'EOF'
110+
kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -c postgres-util -- psql -q -c "$(cat << 'EOF'
111111
CREATE EXTENSION postgis;
112112
CREATE MATERIALIZED VIEW test AS
113113
SELECT 'mpoint_7', ST_AsEWKT(ST_GeomFromGML('<gml:MultiPoint srsName="EPSG:27582"><gml:pointMember><gml:Point><gml:coordinates>1,2</gml:coordinates></gml:Point></gml:pointMember><gml:pointMember><gml:Point srsName="EPSG:27562"><gml:coordinates>400000,5000000</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint>'));
@@ -117,15 +117,15 @@ EOF
117117

118118
if [ "$ONLY_PG_REPACK" != true ] && [ -n "$SOURCE_TIMESCALE_VERSION" ] && [ "$SOURCE_TIMESCALE_VERSION" = "$TARGET_TIMESCALE_VERSION" ]
119119
then
120-
kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -c postgres-util -- psql -c "$(cat << 'EOF'
120+
kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -c postgres-util -- psql -q -c "$(cat << 'EOF'
121121
CREATE EXTENSION timescaledb;
122122
EOF
123123
)"
124124
fi
125125

126126
# Trigger libLLVM bug. See https://gitlab.com/ongresinc/stackgres/-/issues/1980
127127
kubectl exec -i -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -c postgres-util \
128-
-- psql -c "$(cat << 'EOF'
128+
-- psql -q -c "$(cat << 'EOF'
129129
DO $$DECLARE r integer;
130130
BEGIN
131131
FOR r IN SELECT i FROM generate_series(1, 300) AS i
@@ -254,7 +254,7 @@ check_major_version_upgrade_check() {
254254
check_mock_data_samehost "$CLUSTER_NAME"
255255
wait_until run_query -i 1 -q "SELECT 1;"
256256
check_mock_data_replication "$CLUSTER_NAME"
257-
if kubectl exec -ti -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-0" -c patroni -- psql -w -h localhost -p 5432 -c 'SELECT 1'
257+
if kubectl exec -ti -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-0" -c patroni -- psql -q -w -h localhost -p 5432 -c 'SELECT 1'
258258
then
259259
fail "was possible to connect to the cluster without password"
260260
else

‎stackgres-k8s/e2e/spec/abstract/prometheus-integration‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ check_exporter_queries() {
5151
do
5252
QUERY="$(yq -r ".[\"$METRIC\"].query" "$PROJECT_PATH"/stackgres-k8s/src/operator/src/main/resources/prometheus-postgres-exporter/"$QUERIES_FILE")"
5353
if wait_until eval 'kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-0" -c postgres-util -- \
54-
psql -v ON_ERROR_STOP=ON -c "$QUERY" > /dev/null'
54+
psql -q -v ON_ERROR_STOP=ON -c "$QUERY" > /dev/null'
5555
then
5656
echo "Exporter metric $METRIC query is working"
5757
else

‎stackgres-k8s/e2e/spec/autoscaling‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ e2e_test_install() {
3333

3434
PGPASSWORD="$(kubectl get secret -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME" \
3535
--template '{{ (index .data "superuser-password") | base64decode }}')"
36-
kubectl exec -n "$CLUSTER_NAMESPACE" psql \
36+
kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
3737
-- bash -c "PGPASSWORD=$PGPASSWORD pgbench -i -h $CLUSTER_NAME"
3838
}
3939

@@ -87,11 +87,11 @@ check_horizontal_autoscaling() {
8787
--set 'cluster.autoscaling.horizontal.cooldownPeriod=2' \
8888
--set-string 'cluster.autoscaling.horizontal.replicasConnectionsUsageTarget=0.05'
8989

90-
wait_until kubectl exec -n "$CLUSTER_NAMESPACE" psql \
91-
-- bash -c "PGPASSWORD=$PGPASSWORD psql -h $CLUSTER_NAME-replicas -c 'SELECT 1'"
92-
kubectl exec -n "$CLUSTER_NAMESPACE" psql \
90+
wait_until kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
91+
-- bash -c "PGPASSWORD=$PGPASSWORD psql -q -h $CLUSTER_NAME-replicas -c 'SELECT 1'"
92+
kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
9393
-- bash -c "echo 'SELECT pg_sleep(10)' > /tmp/pgsleep.sql"
94-
kubectl exec -n "$CLUSTER_NAMESPACE" psql \
94+
kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
9595
-- bash -c "PGPASSWORD=$PGPASSWORD pgbench -T '$((E2E_TIMEOUT * 2))' -C -c 10 -j 10 -h $CLUSTER_NAME-replicas -f /tmp/pgsleep.sql" > "$LOG_PATH/horizontal-bench" 2>&1 &
9696
BENCH_PID="$!"
9797
trap_kill "$BENCH_PID"
@@ -103,12 +103,12 @@ check_horizontal_autoscaling() {
103103
else
104104
fail_no_return "KEDA can not scale the cluster based on connections"
105105
kill "$BENCH_PID" || true
106-
kubectl exec -n "$CLUSTER_NAMESPACE" psql \
106+
kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
107107
-- bash -c 'ps -ef | grep "[p]gbench" | tr -s " " | cut -d " " -f 2 | while read PID; do kill "$PID"; done' || true
108108
return 1
109109
fi
110110
kill "$BENCH_PID" || true
111-
kubectl exec -n "$CLUSTER_NAMESPACE" psql \
111+
kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
112112
-- bash -c 'ps -ef | grep "[p]gbench" | tr -s " " | cut -d " " -f 2 | while read PID; do kill "$PID"; done' || true
113113
create_or_replace_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE" 2 \
114114
--set-string instanceProfiles[0].name=size-s \
@@ -135,7 +135,7 @@ check_vertical_autoscaling() {
135135
--set-string 'cluster.autoscaling.minAllowed.patroni.cpu=500m' \
136136
--set-string 'cluster.autoscaling.maxAllowed.patroni.cpu=2'
137137

138-
kubectl exec -n "$CLUSTER_NAMESPACE" psql \
138+
kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
139139
-- bash -c "PGPASSWORD=$PGPASSWORD pgbench -T '$((E2E_TIMEOUT * 2))' -C -c 10 -j 10 -h $CLUSTER_NAME" > "$LOG_PATH/vertical-bench" 2>&1 &
140140
BENCH_PID="$!"
141141
trap_kill "$BENCH_PID"
@@ -152,16 +152,16 @@ check_vertical_autoscaling() {
152152
fail_no_return "VerticalPodAutoscaler can not scale vertically the primary of the cluster based on CPU"
153153
kubectl top pod --containers -n "$CLUSTER_NAMESPACE" -l "app=StackGresCluster,stackgres.io/cluster-name=$CLUSTER_NAME,stackgres.io/cluster=true" || true
154154
kill "$BENCH_PID" || true
155-
kubectl exec -n "$CLUSTER_NAMESPACE" psql \
155+
kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
156156
-- bash -c 'ps -ef | grep "[p]gbench" | tr -s " " | cut -d " " -f 2 | while read PID; do kill "$PID"; done' || true
157157
return 1
158158
fi
159159
kill "$BENCH_PID" || true
160-
kubectl exec -n "$CLUSTER_NAMESPACE" psql \
160+
kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
161161
-- bash -c 'ps -ef | grep "[p]gbench" | tr -s " " | cut -d " " -f 2 | while read PID; do kill "$PID"; done' || true
162-
wait_until kubectl exec -n "$CLUSTER_NAMESPACE" psql \
163-
-- bash -c "PGPASSWORD=$PGPASSWORD psql -h autoscaling-replicas -c 'SELECT 1'"
164-
kubectl exec -n "$CLUSTER_NAMESPACE" psql \
162+
wait_until kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
163+
-- bash -c "PGPASSWORD=$PGPASSWORD psql -q -h autoscaling-replicas -c 'SELECT 1'"
164+
kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
165165
-- bash -c "PGPASSWORD=$PGPASSWORD pgbench -T '$((E2E_TIMEOUT * 2))' -C -c 10 -j 10 -h $CLUSTER_NAME-replicas -S" >> "$LOG_PATH/vertical-bench-2" 2>&1 &
166166
BENCH_PID="$!"
167167
trap_kill "$BENCH_PID"
@@ -175,12 +175,12 @@ check_vertical_autoscaling() {
175175
fail_no_return "VerticalPodAutoscaler can not scale vertically the replicas of the cluster based on CPU"
176176
kubectl top pod --containers -n "$CLUSTER_NAMESPACE" -l "app=StackGresCluster,stackgres.io/cluster-name=$CLUSTER_NAME,stackgres.io/cluster=true" || true
177177
kill "$BENCH_PID" || true
178-
kubectl exec -n "$CLUSTER_NAMESPACE" psql \
178+
kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
179179
-- bash -c 'ps -ef | grep "[p]gbench" | tr -s " " | cut -d " " -f 2 | while read PID; do kill "$PID"; done' || true
180180
return 1
181181
fi
182182
kill "$BENCH_PID" || true
183-
kubectl exec -n "$CLUSTER_NAMESPACE" psql \
183+
kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
184184
-- bash -c 'ps -ef | grep "[p]gbench" | tr -s " " | cut -d " " -f 2 | while read PID; do kill "$PID"; done' || true
185185
create_or_replace_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE" 2 \
186186
--set-string instanceProfiles[0].name=size-s \
@@ -219,9 +219,9 @@ check_all_autoscaling() {
219219
--set-string 'cluster.autoscaling.minAllowed.patroni.cpu=500m' \
220220
--set-string 'cluster.autoscaling.maxAllowed.patroni.cpu=2'
221221

222-
wait_until kubectl exec -n "$CLUSTER_NAMESPACE" psql \
223-
-- bash -c "PGPASSWORD=$PGPASSWORD psql -h $CLUSTER_NAME-replicas -c 'SELECT 1'"
224-
kubectl exec -n "$CLUSTER_NAMESPACE" psql \
222+
wait_until kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
223+
-- bash -c "PGPASSWORD=$PGPASSWORD psql -q -h $CLUSTER_NAME-replicas -c 'SELECT 1'"
224+
kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
225225
-- bash -c "PGPASSWORD=$PGPASSWORD pgbench -T '$((E2E_TIMEOUT * 2))' -C -c 25 -j 25 -h $CLUSTER_NAME-replicas -S" > "$LOG_PATH/all-bench" 2>&1 &
226226
BENCH_PID="$!"
227227
trap_kill "$BENCH_PID"
@@ -236,7 +236,7 @@ check_all_autoscaling() {
236236
else
237237
fail_no_return "KEDA can not scale the cluster based on connections"
238238
kill "$BENCH_PID" || true
239-
kubectl exec -n "$CLUSTER_NAMESPACE" psql \
239+
kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
240240
-- bash -c 'ps -ef | grep "[p]gbench" | tr -s " " | cut -d " " -f 2 | while read PID; do kill "$PID"; done' || true
241241
return 1
242242
fi
@@ -250,12 +250,12 @@ check_all_autoscaling() {
250250
fail_no_return "VerticalPodAutoscaler can not scale vertically the replicas of the cluster based on CPU"
251251
kubectl top pod --containers -n "$CLUSTER_NAMESPACE" -l "app=StackGresCluster,stackgres.io/cluster-name=$CLUSTER_NAME,stackgres.io/cluster=true" || true
252252
kill "$BENCH_PID" || true
253-
kubectl exec -n "$CLUSTER_NAMESPACE" psql \
253+
kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
254254
-- bash -c 'ps -ef | grep "[p]gbench" | tr -s " " | cut -d " " -f 2 | while read PID; do kill "$PID"; done' || true
255255
return 1
256256
fi
257257
kill "$BENCH_PID" || true
258-
kubectl exec -n "$CLUSTER_NAMESPACE" psql \
258+
kubectl exec -n "$CLUSTER_NAMESPACE" psql -q\
259259
-- bash -c 'ps -ef | grep "[p]gbench" | tr -s " " | cut -d " " -f 2 | while read PID; do kill "$PID"; done' || true
260260
create_or_replace_cluster "$CLUSTER_NAME" "$CLUSTER_NAMESPACE" 2 \
261261
--set-string instanceProfiles[0].name=size-s \

‎stackgres-k8s/e2e/spec/babelfish‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ pgbouncer_database_check() {
132132
PGPASSWORD="$(kubectl -n "$CLUSTER_NAMESPACE" get secrets "$CLUSTER_NAME" \
133133
-o jsonpath='{.data.pgbouncer-admin-password}' | base64 -d)" \
134134
PGCONNECT_TIMEOUT="$((5 + E2E_TIMEOUT / 10))" \
135-
psql -t -A -U pgbouncer_admin -d pgbouncer -h "$CLUSTER_NAME" -c "SHOW FDS" >/dev/null
135+
psql -q -t -A -U pgbouncer_admin -d pgbouncer -h "$CLUSTER_NAME" -c "SHOW FDS" >/dev/null
136136
then
137137
success "psql could connect to the pgbouncer database with pgobuncer_admin using service"
138138
else
@@ -143,7 +143,7 @@ pgbouncer_database_check() {
143143
PGPASSWORD="$(kubectl -n "$CLUSTER_NAMESPACE" get secrets "$CLUSTER_NAME" \
144144
-o jsonpath='{.data.pgbouncer-stats-password}' | base64 -d)" \
145145
PGCONNECT_TIMEOUT="$((5 + E2E_TIMEOUT / 10))" \
146-
psql -t -A -U pgbouncer_stats -d pgbouncer -h "$CLUSTER_NAME" -c "SHOW VERSION" >/dev/null
146+
psql -q -t -A -U pgbouncer_stats -d pgbouncer -h "$CLUSTER_NAME" -c "SHOW VERSION" >/dev/null
147147
then
148148
success "psql could connect to the pgbouncer database with pgobuncer_stats using service"
149149
else

‎stackgres-k8s/e2e/spec/connectivity‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ e2e_test() {
3838
}
3939

4040
check_password_required() {
41-
if kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-0" -c patroni -- psql -w -h localhost -p 5432 -c 'SELECT 1'
41+
if kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-0" -c patroni -- psql -q -w -h localhost -p 5432 -c 'SELECT 1'
4242
then
4343
fail "was possible to connect to the cluster without password"
4444
else
@@ -57,10 +57,10 @@ host replication all ::1/128 trust
5757
host all all 0.0.0.0/0 md5
5858
host replication replicator 0.0.0.0/0 md5
5959
' | tee /var/lib/postgresql/data/pg_hba.conf
60-
psql -c 'SELECT pg_reload_conf();'
60+
psql -q -c 'SELECT pg_reload_conf();'
6161
EOF
6262

63-
if kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-0" -c patroni -- psql -w -h localhost -p 5432 -c 'SELECT 1'
63+
if kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-0" -c patroni -- psql -q -w -h localhost -p 5432 -c 'SELECT 1'
6464
then
6565
success "was possible to connect to the cluster without password after changing configuration"
6666
else
@@ -80,7 +80,7 @@ EOF
8080
}
8181

8282
check_password_is_required() {
83-
if kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-0" -c patroni -- psql -w -h localhost -p 5432 -c 'SELECT 1'
83+
if kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME-0" -c patroni -- psql -q -w -h localhost -p 5432 -c 'SELECT 1'
8484
then
8585
return 1
8686
fi
@@ -139,7 +139,7 @@ pgbouncer_database_check() {
139139
PGPASSWORD="$(kubectl -n "$CLUSTER_NAMESPACE" get secrets "$CLUSTER_NAME" \
140140
-o jsonpath='{.data.pgbouncer-admin-password}' | base64 -d)" \
141141
PGCONNECT_TIMEOUT="$((5 + E2E_TIMEOUT / 10))" \
142-
psql -t -A -U pgbouncer_admin -d pgbouncer -h "$CLUSTER_NAME" -c "SHOW FDS" >/dev/null
142+
psql -q -t -A -U pgbouncer_admin -d pgbouncer -h "$CLUSTER_NAME" -c "SHOW FDS" >/dev/null
143143
then
144144
success "psql could connect to the pgbouncer database with pgobuncer_admin using service"
145145
else
@@ -150,7 +150,7 @@ pgbouncer_database_check() {
150150
PGPASSWORD="$(kubectl -n "$CLUSTER_NAMESPACE" get secrets "$CLUSTER_NAME" \
151151
-o jsonpath='{.data.pgbouncer-stats-password}' | base64 -d)" \
152152
PGCONNECT_TIMEOUT="$((5 + E2E_TIMEOUT / 10))" \
153-
psql -t -A -U pgbouncer_stats -d pgbouncer -h "$CLUSTER_NAME" -c "SHOW VERSION" >/dev/null
153+
psql -q -t -A -U pgbouncer_stats -d pgbouncer -h "$CLUSTER_NAME" -c "SHOW VERSION" >/dev/null
154154
then
155155
success "psql could connect to the pgbouncer database with pgobuncer_stats using service"
156156
else

‎stackgres-k8s/e2e/spec/dbops-sampling‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ e2e_test() {
2727

2828
check_sampling_is_working() {
2929
kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -c patroni \
30-
-- psql -c 'CREATE DATABASE sampling'
30+
-- psql -q -c 'CREATE DATABASE sampling'
3131
kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -c patroni \
3232
-- pgbench -s 10 -i -I dtgv
3333
kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -c patroni \

‎stackgres-k8s/e2e/spec/previous/1.12/spec/abstract/backup‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ rotate_wal_file() {
4040
local CURRENT_WAL_FILE
4141
CURRENT_WAL_FILE="$(get_current_wal_file "$1")"
4242
wait_until eval '[ "$(kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-"$NODE" -c postgres-util -- \
43-
psql -t -A -p 5432 \
43+
psql -q -t -A -p 5432 \
4444
-c "CHECKPOINT" \
4545
-c "SELECT r.file_name from pg_walfile_name_offset(pg_switch_wal()) as r")" != "$CURRENT_WAL_FILE" ]' >&2
4646
printf '%s' "$CURRENT_WAL_FILE"
@@ -49,7 +49,7 @@ rotate_wal_file() {
4949
get_current_wal_file() {
5050
local NODE="${1:-0}"
5151
kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-"$NODE" -c postgres-util -- \
52-
psql -t -A -p 5432 -c \
52+
psql -q -t -A -p 5432 -c \
5353
'SELECT r.file_name from pg_walfile_name_offset(pg_current_wal_lsn()) as r'
5454
}
5555

‎stackgres-k8s/e2e/spec/previous/1.12/spec/abstract/dbops-major-version-upgrade‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ reset_cluster_internal() {
107107

108108
if [ "$ONLY_PG_REPACK" != true ] && [ -n "$SOURCE_POSTGIS_VERSION" ] && [ "$SOURCE_POSTGIS_VERSION" = "$TARGET_POSTGIS_VERSION" ]
109109
then
110-
kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -c postgres-util -- psql -c "$(cat << 'EOF'
110+
kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -c postgres-util -- psql -q -c "$(cat << 'EOF'
111111
CREATE EXTENSION postgis;
112112
CREATE MATERIALIZED VIEW test AS
113113
SELECT 'mpoint_7', ST_AsEWKT(ST_GeomFromGML('<gml:MultiPoint srsName="EPSG:27582"><gml:pointMember><gml:Point><gml:coordinates>1,2</gml:coordinates></gml:Point></gml:pointMember><gml:pointMember><gml:Point srsName="EPSG:27562"><gml:coordinates>400000,5000000</gml:coordinates></gml:Point></gml:pointMember></gml:MultiPoint>'));
@@ -117,15 +117,15 @@ EOF
117117

118118
if [ "$ONLY_PG_REPACK" != true ] && [ -n "$SOURCE_TIMESCALE_VERSION" ] && [ "$SOURCE_TIMESCALE_VERSION" = "$TARGET_TIMESCALE_VERSION" ]
119119
then
120-
kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -c postgres-util -- psql -c "$(cat << 'EOF'
120+
kubectl exec -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -c postgres-util -- psql -q -c "$(cat << 'EOF'
121121
CREATE EXTENSION timescaledb;
122122
EOF
123123
)"
124124
fi
125125

126126
# Trigger libLLVM bug. See https://gitlab.com/ongresinc/stackgres/-/issues/1980
127127
kubectl exec -i -n "$CLUSTER_NAMESPACE" "$CLUSTER_NAME"-0 -c postgres-util \
128-
-- psql -c "$(cat << 'EOF'
128+
-- psql -q -c "$(cat << 'EOF'
129129
DO $$DECLARE r integer;
130130
BEGIN
131131
FOR r IN SELECT i FROM generate_series(1, 300) AS i

0 commit comments

Comments
 (0)