Skip to content

Commit 2fdcdb2

Browse files
mohitj1988mohitj1988
committed
Fixed some more PG TDE tests
1 parent d207fe7 commit 2fdcdb2

File tree

3 files changed

+17
-10
lines changed

3 files changed

+17
-10
lines changed

‎postgresql/tests/ddl_load_with_streaming_replication.sh‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# Set variable
4-
export INSTALL_DIR=/home/mohit.joshi/postgresql/pg_tde/bld_tde/install
4+
export INSTALL_DIR=/home/mohit.joshi/postgresql/pg_tde/bld_17.5.2/install
55
export PGDATA=$INSTALL_DIR/primary_data
66
export PGDATA2=$INSTALL_DIR/replica_data
77
export LOG_FILE=$PGDATA/server.log
@@ -24,6 +24,7 @@ setup_db() {
2424
$INSTALL_DIR/bin/psql -d postgres -c "CREATE DATABASE $DB_NAME"
2525
$INSTALL_DIR/bin/psql -d $DB_NAME -c "CREATE EXTENSION pg_tde"
2626
$INSTALL_DIR/bin/psql -d $DB_NAME -c "SELECT pg_tde_add_database_key_provider_file('local_keyring','$PGDATA/keyring.file');"
27+
$INSTALL_DIR/bin/psql -d $DB_NAME -c "SELECT pg_tde_create_key_using_database_key_provider('principal_key_sbtest','local_keyring');"
2728
$INSTALL_DIR/bin/psql -d $DB_NAME -c "SELECT pg_tde_set_key_using_database_key_provider('principal_key_sbtest','local_keyring');"
2829
for i in $(seq 1 $TOTAL_TABLES); do
2930
TABLE_NAME="${TABLE_PREFIX}_${i}"
@@ -159,7 +160,8 @@ rotate_master_key(){
159160
sleep 5
160161
RAND_KEY=$(( ( RANDOM % 1000000 ) + 1 ))
161162
echo "Rotating master key: principal_key_test$RAND_KEY"
162-
$INSTALL_DIR/bin/psql -d $DB_NAME -c "SELECT pg_tde_set_key_using_database_key_provider('principal_key_test$RAND_KEY','local_keyring','true');" || echo "SQL command failed, continuing..."
163+
$INSTALL_DIR/bin/psql -d $DB_NAME -c "SELECT pg_tde_create_key_using_database_key_provider('principal_key_test$RAND_KEY','local_keyring');" || echo "SQL command failed, continuing..."
164+
$INSTALL_DIR/bin/psql -d $DB_NAME -c "SELECT pg_tde_set_key_using_database_key_provider('principal_key_test$RAND_KEY','local_keyring');" || echo "SQL command failed, continuing..."
163165
done
164166
}
165167

@@ -261,6 +263,3 @@ for i in {1..5}; do
261263
done
262264

263265
echo "Multi-table DDL stress test completed."
264-
265-
# Cleanup
266-

‎postgresql/tests/pg_tde_logical_replication.sh‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# Set variable
4-
INSTALL_DIR=/home/mohit.joshi/postgresql/pg_tde/bld_tde/install
4+
INSTALL_DIR=/home/mohit.joshi/postgresql/pg_tde/bld_17.5.2/install
55
PUB_DATA=$INSTALL_DIR/pub_db
66
SUB_DATA=$INSTALL_DIR/sub_db
77
PUB_LOG=$PUB_DATA/pub.log
@@ -40,16 +40,19 @@ start_server() {
4040
$INSTALL_DIR/bin/createdb "-p 5433" pub_db
4141
$INSTALL_DIR/bin/psql -d pub_db -p 5433 -c"CREATE EXTENSION IF NOT EXISTS pg_tde;"
4242
$INSTALL_DIR/bin/psql -d pub_db -p 5433 -c"SELECT pg_tde_add_database_key_provider_file('local_keyring','$PUB_DATA/keyring.file');"
43+
$INSTALL_DIR/bin/psql -d pub_db -p 5433 -c"SELECT pg_tde_create_key_using_database_key_provider('principal_key_sbtest','local_keyring');"
4344
$INSTALL_DIR/bin/psql -d pub_db -p 5433 -c"SELECT pg_tde_set_key_using_database_key_provider('principal_key_sbtest','local_keyring');"
4445

4546
$INSTALL_DIR/bin/psql -d pub_db -p 5433 -c"SELECT pg_tde_add_global_key_provider_file('local_keyring','$PUB_DATA/keyring.file');"
47+
$INSTALL_DIR/bin/psql -d pub_db -p 5433 -c"SELECT pg_tde_create_key_using_global_key_provider('principal_key_sbtest','local_keyring');"
4648
$INSTALL_DIR/bin/psql -d pub_db -p 5433 -c"SELECT pg_tde_set_server_key_using_global_key_provider('principal_key_sbtest','local_keyring');"
4749
$INSTALL_DIR/bin/psql -d pub_db -p 5433 -c"ALTER SYSTEM SET pg_tde.wal_encrypt = on;"
4850

4951
$INSTALL_DIR/bin/pg_ctl -D $SUB_DATA -l $SUB_LOG start
5052
$INSTALL_DIR/bin/createdb -p 5434 sub_db
5153
$INSTALL_DIR/bin/psql -d sub_db -p 5434 -c"CREATE EXTENSION IF NOT EXISTS pg_tde;"
5254
$INSTALL_DIR/bin/psql -d sub_db -p 5434 -c"SELECT pg_tde_add_database_key_provider_file('local_keyring','$SUB_DATA/keyring.file');"
55+
$INSTALL_DIR/bin/psql -d sub_db -p 5434 -c"SELECT pg_tde_create_key_using_database_key_provider('principal_key_sbtest','local_keyring');"
5356
$INSTALL_DIR/bin/psql -d sub_db -p 5434 -c"SELECT pg_tde_set_key_using_database_key_provider('principal_key_sbtest','local_keyring');"
5457
}
5558

@@ -94,7 +97,8 @@ rotate_wal_key(){
9497
while [ $SECONDS -lt $end_time ]; do
9598
RAND_KEY=$(( ( RANDOM % 1000000 ) + 1 ))
9699
echo "Rotating master key: principal_key_test$RAND_KEY"
97-
$INSTALL_DIR/bin/psql -d pub_db -p 5433 -c "SELECT pg_tde_set_server_key_using_global_key_provider('principal_key_test$RAND_KEY','local_keyring','true');" || echo "SQL command failed, continuing..."
100+
$INSTALL_DIR/bin/psql -d pub_db -p 5433 -c "SELECT pg_tde_create_key_using_global_key_provider('principal_key_test$RAND_KEY','local_keyring');" || echo "SQL command failed, continuing..."
101+
$INSTALL_DIR/bin/psql -d pub_db -p 5433 -c "SELECT pg_tde_set_server_key_using_global_key_provider('principal_key_test$RAND_KEY','local_keyring');" || echo "SQL command failed, continuing..."
98102

99103
done
100104
}

‎postgresql/tests/pg_tde_streaming_replication.sh‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
# Set variable
4-
INSTALL_DIR=/home/mohit.joshi/postgresql/pg_tde/bld_tde/install
4+
INSTALL_DIR=/home/mohit.joshi/postgresql/pg_tde/bld_17.5.2/install
55
PRIMARY_DATA=$INSTALL_DIR/primary_data
66
REPLICA_DATA=$INSTALL_DIR/replica_data
77
PRIMARY_LOGFILE=$PRIMARY_DATA/server.log
@@ -86,7 +86,8 @@ rotate_wal_key(){
8686
while [ $SECONDS -lt $end_time ]; do
8787
RAND_KEY=$(( ( RANDOM % 1000000 ) + 1 ))
8888
echo "Rotating Global master key: principal_key_test$RAND_KEY"
89-
$INSTALL_DIR/bin/psql -d $DB_NAME -p 5433 -c "SELECT pg_tde_set_server_key_using_global_key_provider('principal_key_test$RAND_KEY','local_keyring','true');" || echo "SQL command failed, continuing..."
89+
$INSTALL_DIR/bin/psql -d $DB_NAME -p 5433 -c "SELECT pg_tde_create_key_using_global_key_provider('principal_key_test$RAND_KEY','local_keyring');" || echo "SQL command failed, continuing..."
90+
$INSTALL_DIR/bin/psql -d $DB_NAME -p 5433 -c "SELECT pg_tde_set_server_key_using_global_key_provider('principal_key_test$RAND_KEY','local_keyring');" || echo "SQL command failed, continuing..."
9091
done
9192
}
9293

@@ -117,7 +118,8 @@ rotate_master_key(){
117118
while [ $SECONDS -lt $end_time ]; do
118119
RAND_KEY=$(( ( RANDOM % 1000000 ) + 1 ))
119120
echo "Rotating master key: principal_key_test$RAND_KEY"
120-
$INSTALL_DIR/bin/psql -d $DB_NAME -p 5433 -c"SELECT pg_tde_set_key_using_database_key_provider('principal_key_test$RAND_KEY','local_keyring','true');" || echo "SQL command failed, continue..."
121+
$INSTALL_DIR/bin/psql -d $DB_NAME -p 5433 -c"SELECT pg_tde_create_key_using_database_key_provider('principal_key_test$RAND_KEY','local_keyring');" || echo "SQL command failed, continue..."
122+
$INSTALL_DIR/bin/psql -d $DB_NAME -p 5433 -c"SELECT pg_tde_set_key_using_database_key_provider('principal_key_test$RAND_KEY','local_keyring');" || echo "SQL command failed, continue..."
121123
done
122124
}
123125

@@ -137,8 +139,10 @@ enable_tde_and_recreate_load() {
137139
$INSTALL_DIR/bin/psql -d postgres -p 5433 -c"CREATE DATABASE $DB_NAME;"
138140
$INSTALL_DIR/bin/psql -d $DB_NAME -p 5433 -c"CREATE EXTENSION IF NOT EXISTS pg_tde;"
139141
$INSTALL_DIR/bin/psql -d $DB_NAME -p 5433 -c"SELECT pg_tde_add_database_key_provider_file('local_key_provider','$PRIMARY_DATA/keyring.file');"
142+
$INSTALL_DIR/bin/psql -d $DB_NAME -p 5433 -c"SELECT pg_tde_create_key_using_database_key_provider('local_key','local_key_provider');"
140143
$INSTALL_DIR/bin/psql -d $DB_NAME -p 5433 -c"SELECT pg_tde_set_key_using_database_key_provider('local_key','local_key_provider');"
141144
$INSTALL_DIR/bin/psql -d $DB_NAME -p 5433 -c"SELECT pg_tde_add_global_key_provider_file('global_key_provider','$PRIMARY_DATA/keyring.file');"
145+
$INSTALL_DIR/bin/psql -d $DB_NAME -p 5433 -c"SELECT pg_tde_create_key_using_global_key_provider('global_key','global_key_provider');"
142146
$INSTALL_DIR/bin/psql -d $DB_NAME -p 5433 -c"SELECT pg_tde_set_server_key_using_global_key_provider('global_key','global_key_provider');"
143147

144148
echo "Create some tables on Primary Node"

0 commit comments

Comments
 (0)