Skip to content

Commit b2398f0

Browse files
committed
Unlink existing file provider file
1 parent da45a39 commit b2398f0

File tree

60 files changed

+208
-99
lines changed

Some content is hidden

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

60 files changed

+208
-99
lines changed

postgresql/t/050_tde_parallel_concurrency_test.pl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ sub setup_servers {
8787

8888
# Setup pg_tde encryption on the primary node
8989
sub setup_encryption {
90+
unlink('/tmp/global_keyring.file');
91+
unlink('/tmp/local_keyring.file');
9092
my ($node, $db_name) = @_;
9193
$node->safe_psql($db_name, 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
9294
$node->safe_psql($db_name,

postgresql/t/051_tde_stream_replication.pl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
$node_standby_2->start;
5757

5858
#PGTDE::append_to_result_file("-- At primary");
59-
59+
unlink('/tmp/unlogged_tables.per');
6060
$node_primary->safe_psql('postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
6161
$node_primary->safe_psql('postgres',
6262
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per');"

postgresql/t/052_tde_archiving.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222

2323
# Start it
2424
$node_primary->start;
25+
unlink('/tmp/unlogged_tables.per');
2526
$node_primary->safe_psql('postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
2627
$node_primary->safe_psql('postgres',
2728
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per');"

postgresql/t/053_tde_recovery_targets.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ sub test_recovery_standby
6565

6666
# Start it
6767
$node_primary->start;
68+
unlink('/tmp/unlogged_tables.per');
6869
$node_primary->safe_psql('postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
6970
$node_primary->safe_psql('postgres',
7071
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per');"

postgresql/t/054_tde_timeline_switch.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
$node_primary->append_conf('postgresql.conf', "default_table_access_method = 'tde_heap'");
1919
$node_primary->start;
2020

21+
unlink('/tmp/unlogged_tables.per');
2122
# Create and enable tde extension
2223
$node_primary->safe_psql('postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
2324
$node_primary->safe_psql('postgres',

postgresql/t/055_tde_replay_delay.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
$node_primary->append_conf('postgresql.conf', "default_table_access_method = 'tde_heap'");
1717
$node_primary->start;
1818

19+
unlink('/tmp/unlogged_tables.per');
1920
# Create and enable tde extension
2021
$node_primary->safe_psql('postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
2122
$node_primary->safe_psql('postgres',

postgresql/t/056_tde_logical_decoding.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
$node_primary->start;
2626
my $backup_name = 'primary_backup';
2727

28+
unlink('/tmp/unlogged_tables.per');
2829
# Create and enable tde extension
2930
$node_primary->safe_psql('postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
3031
$node_primary->safe_psql('postgres',

postgresql/t/057_tde_sync_rep.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ sub start_standby_and_wait
5858
$node_primary->start;
5959
my $backup_name = 'primary_backup';
6060

61+
unlink('/tmp/unlogged_tables.per');
6162
# Create and enable tde extension
6263
$node_primary->safe_psql('postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
6364
$node_primary->safe_psql('postgres',

postgresql/t/058_tde_fsm_truncation.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
# at the same time.
2828
$node_primary->start;
2929
# Create and enable tde extension
30+
unlink('/tmp/unlogged_tables.per');
3031
$node_primary->safe_psql('postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
3132
$node_primary->safe_psql('postgres',
3233
"SELECT pg_tde_add_database_key_provider_file('file-vault', '/tmp/unlogged_tables.per');"

postgresql/t/059_tde_twophase.pl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ sub configure_and_reload
4242
$node_london->append_conf('postgresql.conf', "default_table_access_method = 'tde_heap'");
4343
$node_london->start;
4444

45+
unlink('/tmp/unlogged_tables.per');
4546
# Create and enable tde extension
4647
$node_london->safe_psql('postgres', 'CREATE EXTENSION IF NOT EXISTS pg_tde;');
4748
$node_london->safe_psql('postgres',

0 commit comments

Comments
 (0)