sharpetronics/PostgreSQL
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-20 00:03:14 -04:00
Code Issues Projects Releases Wiki Activity

Move all pg_tde related tests into contrib/pg_tde

Browse Source 
While these tests test our changes to pg_waldump they are quite easy to
overlook right now and where exactly should we draw the line? These
tests are not something we ever want to upstream and in the future when
we figure out how we want to make sure pg_waldump works with encrypted
WAL we likely will want to have the tests for that solution in the same
folder as our other tests anyway.
This commit is contained in:
Andreas Karlsson 2025-04-26 00:34:55 +02:00 committed by Andreas Karlsson
parent bb000ef9e8
commit 23786e9922
4 changed files with 60 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/pg_tde/meson.build
View File

@ -114,6 +114,8 @@ tap_tests = [
't/011_unlogged_tables.pl',
't/012_replication.pl',
't/013_crash_recovery.pl',
't/014_pg_waldump_basic.pl',
't/015_pg_waldump_fullpage.pl',
]
tests += {

68
src/bin/pg_waldump/t/003_basic_encrypted.pl → contrib/pg_tde/t/014_pg_waldump_basic.pl
View File

@ -27,8 +27,12 @@ shared_preload_libraries = 'pg_tde'
$node->start;
$node->safe_psql('postgres', "CREATE EXTENSION IF NOT EXISTS pg_tde;");
$node->safe_psql('postgres', "SELECT pg_tde_add_global_key_provider_file('file-keyring-wal','/tmp/pg_tde_test_keyring-wal.per');");;
$node->safe_psql('postgres', "SELECT pg_tde_set_server_key_using_global_key_provider('server-key', 'file-keyring-wal');");
$node->safe_psql('postgres',
"SELECT pg_tde_add_global_key_provider_file('file-keyring-wal','/tmp/pg_tde_test_keyring-wal.per');"
);
$node->safe_psql('postgres',
"SELECT pg_tde_set_server_key_using_global_key_provider('server-key', 'file-keyring-wal');"
);
$node->append_conf(
'postgresql.conf', q{
@ -128,48 +132,74 @@ command_fails_like(
[ 'pg_waldump', 'foo', 'bar' ],
qr/error: could not locate WAL file "foo"/,
'start file not found');
command_like([ 'pg_waldump', '-k', $node->data_dir. '/pg_tde', $node->data_dir . '/pg_wal/' . $start_walfile ],
qr/./, 'runs with start segment specified');
command_like(
[
'pg_waldump', '-k',
$node->data_dir . '/pg_tde',
$node->data_dir . '/pg_wal/' . $start_walfile
],
qr/./,
'runs with start segment specified');
command_fails_like(
[ 'pg_waldump', '-k', $node->data_dir. '/pg_tde', $node->data_dir . '/pg_wal/' . $start_walfile, 'bar' ],
[
'pg_waldump', '-k',
$node->data_dir . '/pg_tde',
$node->data_dir . '/pg_wal/' . $start_walfile, 'bar'
],
qr/error: could not open file "bar"/,
'end file not found');
command_like(
[
'pg_waldump',
'-k', $node->data_dir. '/pg_tde',
'-k',
$node->data_dir . '/pg_tde',
$node->data_dir . '/pg_wal/' . $start_walfile,
$node->data_dir . '/pg_wal/' . $end_walfile
],
qr/./,
'runs with start and end segment specified');
command_fails_like(
[ 'pg_waldump', '-p', $node->data_dir, '-k', $node->data_dir. '/pg_tde' ],
[
'pg_waldump', '-p', $node->data_dir, '-k',
$node->data_dir . '/pg_tde'
],
qr/error: no start WAL location given/,
'path option requires start location');
command_like(
[
'pg_waldump', '-p', $node->data_dir, '--start',
$start_lsn, '--end', $end_lsn,
'-k', $node->data_dir. '/pg_tde'
'pg_waldump', '-p',
$node->data_dir, '--start',
$start_lsn, '--end',
$end_lsn, '-k',
$node->data_dir . '/pg_tde'
],
qr/./,
'runs with path option and start and end locations');
command_fails_like(
[ 'pg_waldump', '-k', $node->data_dir. '/pg_tde', '-p', $node->data_dir, '--start', $start_lsn ],
[
'pg_waldump', '-k',
$node->data_dir . '/pg_tde', '-p',
$node->data_dir, '--start',
$start_lsn
],
qr/error: error in WAL record at/,
'falling off the end of the WAL results in an error');
command_like(
[
'pg_waldump', '--quiet',
'-k', $node->data_dir. '/pg_tde',
'pg_waldump', '--quiet', '-k',
$node->data_dir . '/pg_tde',
$node->data_dir . '/pg_wal/' . $start_walfile
],
qr/^$/,
'no output with --quiet option');
command_fails_like(
[ 'pg_waldump', '--quiet', '-k', $node->data_dir. '/pg_tde', '-p', $node->data_dir, '--start', $start_lsn ],
[
'pg_waldump', '--quiet',
'-k', $node->data_dir . '/pg_tde',
'-p', $node->data_dir,
'--start', $start_lsn
],
qr/error: error in WAL record at/,
'errors are shown with --quiet');
@ -188,8 +218,7 @@ command_fails_like(
@cmd = (
'pg_waldump', '-k', $node->data_dir . '/pg_tde',
'--start', $new_start,
$node->data_dir . '/pg_wal/' . $start_walfile);
'--start', $new_start, $node->data_dir . '/pg_wal/' . $start_walfile);
$result = IPC::Run::run \@cmd, '>', \$stdout, '2>', \$stderr;
ok($result, "runs with start segment and start LSN specified");
like($stderr, qr/first record is after/, 'info message printed');
@ -206,8 +235,11 @@ sub test_pg_waldump
my (@cmd, $stdout, $stderr, $result, @lines);
@cmd = (
'pg_waldump', '-k', $node->data_dir. '/pg_tde', '-p', $node->data_dir,
'--start', $start_lsn, '--end', $end_lsn);
'pg_waldump', '-k',
$node->data_dir . '/pg_tde', '-p',
$node->data_dir, '--start',
$start_lsn, '--end',
$end_lsn);
push @cmd, @opts;
$result = IPC::Run::run \@cmd, '>', \$stdout, '2>', \$stderr;
ok($result, "pg_waldump @opts: runs ok");

8
src/bin/pg_waldump/t/004_save_fullpage_encrypted.pl → contrib/pg_tde/t/015_pg_waldump_fullpage.pl
View File

@ -41,8 +41,12 @@ shared_preload_libraries = 'pg_tde'
$node->start;
$node->safe_psql('postgres', "CREATE EXTENSION IF NOT EXISTS pg_tde;");
$node->safe_psql('postgres', "SELECT pg_tde_add_global_key_provider_file('file-keyring-wal','/tmp/pg_tde_test_keyring-wal.per');");;
$node->safe_psql('postgres', "SELECT pg_tde_set_server_key_using_global_key_provider('server-key', 'file-keyring-wal');");
$node->safe_psql('postgres',
"SELECT pg_tde_add_global_key_provider_file('file-keyring-wal','/tmp/pg_tde_test_keyring-wal.per');"
);
$node->safe_psql('postgres',
"SELECT pg_tde_set_server_key_using_global_key_provider('server-key', 'file-keyring-wal');"
);
$node->append_conf(
'postgresql.conf', q{

2
src/bin/pg_waldump/meson.build
View File

@ -42,8 +42,6 @@ tests += {
'tests': [
't/001_basic.pl',
't/002_save_fullpage.pl',
't/003_basic_encrypted.pl',
't/004_save_fullpage_encrypted.pl',
],
},
}