Run perltidy
A follow-up patch will adjust the TAP tests to follow a more-structured format for option lists in commands, that perltidy is able to cope better with. Putting the tree first in a clean state makes the next change a bit easier. v20230309 has been used. Author: Dagfinn Ilmari Mannsåker Discussion: https://postgr.es/m/87jzc46d8u.fsf@wibble.ilmari.org
This commit is contained in:
parent
4907ba304c
commit
be31ac2519
@ -55,7 +55,8 @@ EOM
|
||||
$node2->start();
|
||||
|
||||
# Wait until recovery pauses, then promote.
|
||||
$node2->poll_query_until('postgres', "SELECT pg_get_wal_replay_pause_state() = 'paused';");
|
||||
$node2->poll_query_until('postgres',
|
||||
"SELECT pg_get_wal_replay_pause_state() = 'paused';");
|
||||
$node2->safe_psql('postgres', "SELECT pg_promote()");
|
||||
|
||||
# Once promotion occurs, insert a second row on the new node.
|
||||
@ -68,8 +69,10 @@ EOM
|
||||
# timeline change correctly, something should break at this point.
|
||||
my $backup2path = $node1->backup_dir . '/backup2';
|
||||
$node2->command_ok(
|
||||
[ 'pg_basebackup', '-D', $backup2path, '--no-sync', '-cfast',
|
||||
'--incremental', $backup1path . '/backup_manifest' ],
|
||||
[
|
||||
'pg_basebackup', '-D', $backup2path, '--no-sync', '-cfast',
|
||||
'--incremental', $backup1path . '/backup_manifest'
|
||||
],
|
||||
"incremental backup from node2");
|
||||
|
||||
# Restore the incremental backup and use it to create a new node.
|
||||
|
@ -57,9 +57,7 @@ for my $iname (@filelist)
|
||||
# pg_combinebackup should fail.
|
||||
my $outpath = $primary->backup_dir . '/out';
|
||||
$primary->command_fails_like(
|
||||
[
|
||||
'pg_combinebackup', $backup1path, $backup2path, '-o', $outpath,
|
||||
],
|
||||
[ 'pg_combinebackup', $backup1path, $backup2path, '-o', $outpath, ],
|
||||
qr/full backup contains unexpected incremental file/,
|
||||
"pg_combinebackup fails");
|
||||
|
||||
|
@ -42,7 +42,8 @@ sub test_checksums
|
||||
}
|
||||
|
||||
# A backup with a valid algorithm should work.
|
||||
$primary->command_ok(\@backup, "$format format backup ok with algorithm \"$algorithm\"");
|
||||
$primary->command_ok(\@backup,
|
||||
"$format format backup ok with algorithm \"$algorithm\"");
|
||||
|
||||
# We expect each real checksum algorithm to be mentioned on every line of
|
||||
# the backup manifest file except the first and last; for simplicity, we
|
||||
@ -50,7 +51,8 @@ sub test_checksums
|
||||
# is none, we just check that the manifest exists.
|
||||
if ($algorithm eq 'none')
|
||||
{
|
||||
ok(-f "$backup_path/backup_manifest", "$format format backup manifest exists");
|
||||
ok( -f "$backup_path/backup_manifest",
|
||||
"$format format backup manifest exists");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -60,12 +60,14 @@ my @scenario = (
|
||||
{
|
||||
'name' => 'append_to_file',
|
||||
'mutilate' => \&mutilate_append_to_file,
|
||||
'fails_like' => qr/has size \d+ (on disk|in "[^"]+") but size \d+ in the manifest/
|
||||
'fails_like' =>
|
||||
qr/has size \d+ (on disk|in "[^"]+") but size \d+ in the manifest/
|
||||
},
|
||||
{
|
||||
'name' => 'truncate_file',
|
||||
'mutilate' => \&mutilate_truncate_file,
|
||||
'fails_like' => qr/has size 0 (on disk|in "[^"]+") but size \d+ in the manifest/
|
||||
'fails_like' =>
|
||||
qr/has size 0 (on disk|in "[^"]+") but size \d+ in the manifest/
|
||||
},
|
||||
{
|
||||
'name' => 'replace_file',
|
||||
@ -147,8 +149,9 @@ for my $scenario (@scenario)
|
||||
# same problem, unless the scenario needs UNIX permissions or we don't
|
||||
# have a TAR program available. Note that this destructively modifies
|
||||
# the backup directory.
|
||||
if (! $scenario->{'needs_unix_permissions'} ||
|
||||
!defined $tar || $tar eq '')
|
||||
if ( !$scenario->{'needs_unix_permissions'}
|
||||
|| !defined $tar
|
||||
|| $tar eq '')
|
||||
{
|
||||
my $tar_backup_path = $primary->backup_dir . '/tar_' . $name;
|
||||
mkdir($tar_backup_path) || die "mkdir $tar_backup_path: $!";
|
||||
@ -163,7 +166,8 @@ for my $scenario (@scenario)
|
||||
my $tspath = $backup_path . '/pg_tblspc/' . $tsoid;
|
||||
|
||||
chdir($tspath) || die "chdir: $!";
|
||||
command_ok([ $tar, '-cf', "$tar_backup_path/$tsoid.tar", '.' ]);
|
||||
command_ok(
|
||||
[ $tar, '-cf', "$tar_backup_path/$tsoid.tar", '.' ]);
|
||||
chdir($cwd) || die "chdir: $!";
|
||||
rmtree($tspath);
|
||||
}
|
||||
@ -175,9 +179,10 @@ for my $scenario (@scenario)
|
||||
rmtree($backup_path . '/pg_wal');
|
||||
|
||||
# move the backup manifest
|
||||
move($backup_path . '/backup_manifest',
|
||||
$tar_backup_path . '/backup_manifest')
|
||||
or die "could not copy manifest to $tar_backup_path";
|
||||
move(
|
||||
$backup_path . '/backup_manifest',
|
||||
$tar_backup_path . '/backup_manifest'
|
||||
) or die "could not copy manifest to $tar_backup_path";
|
||||
|
||||
# Construct base.tar with what's left.
|
||||
chdir($backup_path) || die "chdir: $!";
|
||||
|
@ -29,8 +29,7 @@ is($stdout, '', "-q succeeds: no stdout");
|
||||
is($stderr, '', "-q succeeds: no stderr");
|
||||
|
||||
# Should still work if we specify -Fp.
|
||||
$primary->command_ok(
|
||||
[ 'pg_verifybackup', '-Fp', $backup_path ],
|
||||
$primary->command_ok([ 'pg_verifybackup', '-Fp', $backup_path ],
|
||||
"verifies with -Fp");
|
||||
|
||||
# Should not work if we specify -Fy because that's invalid.
|
||||
|
@ -20,12 +20,14 @@ $primary->start;
|
||||
my $source_ts_path = PostgreSQL::Test::Utils::tempdir_short();
|
||||
|
||||
# Create a tablespace with table in it.
|
||||
$primary->safe_psql('postgres', qq(
|
||||
$primary->safe_psql(
|
||||
'postgres', qq(
|
||||
CREATE TABLESPACE regress_ts1 LOCATION '$source_ts_path';
|
||||
SELECT oid FROM pg_tablespace WHERE spcname = 'regress_ts1';
|
||||
CREATE TABLE regress_tbl1(i int) TABLESPACE regress_ts1;
|
||||
INSERT INTO regress_tbl1 VALUES(generate_series(1,5));));
|
||||
my $tsoid = $primary->safe_psql('postgres', qq(
|
||||
my $tsoid = $primary->safe_psql(
|
||||
'postgres', qq(
|
||||
SELECT oid FROM pg_tablespace WHERE spcname = 'regress_ts1'));
|
||||
|
||||
my $backup_path = $primary->backup_dir . '/server-backup';
|
||||
|
@ -1214,7 +1214,8 @@ sub stop
|
||||
|
||||
print "### Stopping node \"$name\" using mode $mode\n";
|
||||
my @cmd = ('pg_ctl', '-D', $pgdata, '-m', $mode, 'stop');
|
||||
if ($params{timeout}) {
|
||||
if ($params{timeout})
|
||||
{
|
||||
push(@cmd, ('--timeout', $params{timeout}));
|
||||
}
|
||||
$ret = PostgreSQL::Test::Utils::system_log(@cmd);
|
||||
|
@ -532,8 +532,10 @@ check_slots_conflict_reason('vacuum_full_', 'rows_removed');
|
||||
'postgres',
|
||||
qq[ALTER_REPLICATION_SLOT vacuum_full_inactiveslot (failover);],
|
||||
replication => 'database');
|
||||
ok($stderr =~ /ERROR: cannot alter invalid replication slot "vacuum_full_inactiveslot"/ &&
|
||||
$stderr =~ /DETAIL: This replication slot has been invalidated due to "rows_removed"./,
|
||||
ok( $stderr =~
|
||||
/ERROR: cannot alter invalid replication slot "vacuum_full_inactiveslot"/
|
||||
&& $stderr =~
|
||||
/DETAIL: This replication slot has been invalidated due to "rows_removed"./,
|
||||
"invalidated slot cannot be altered");
|
||||
|
||||
# Ensure that replication slot stats are not removed after invalidation.
|
||||
|
@ -95,7 +95,8 @@ $subscriber1->safe_psql('postgres',
|
||||
# Disable failover for enabled subscription
|
||||
my ($result, $stdout, $stderr) = $subscriber1->psql('postgres',
|
||||
"ALTER SUBSCRIPTION regress_mysub1 SET (failover = false)");
|
||||
ok( $stderr =~ /ERROR: cannot set option "failover" for enabled subscription/,
|
||||
ok( $stderr =~
|
||||
/ERROR: cannot set option "failover" for enabled subscription/,
|
||||
"altering failover is not allowed for enabled subscription");
|
||||
|
||||
##################################################
|
||||
@ -280,7 +281,8 @@ $standby1->safe_psql('postgres', "SELECT pg_sync_replication_slots();");
|
||||
|
||||
# Confirm that the invalidated slot has been dropped.
|
||||
$standby1->wait_for_log(
|
||||
qr/dropped replication slot "lsub1_slot" of database with OID [0-9]+/, $log_offset);
|
||||
qr/dropped replication slot "lsub1_slot" of database with OID [0-9]+/,
|
||||
$log_offset);
|
||||
|
||||
# Confirm that the logical slot has been re-created on the standby and is
|
||||
# flagged as 'synced'
|
||||
|
@ -302,7 +302,8 @@ sub switch_server_cert
|
||||
$node->append_conf('sslconfig.conf', $backend->set_server_cert(\%params));
|
||||
# use lists of ECDH curves and cipher suites for syntax testing
|
||||
$node->append_conf('sslconfig.conf', 'ssl_groups=prime256v1:secp521r1');
|
||||
$node->append_conf('sslconfig.conf', 'ssl_tls13_ciphers=TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256');
|
||||
$node->append_conf('sslconfig.conf',
|
||||
'ssl_tls13_ciphers=TLS_AES_256_GCM_SHA384:TLS_AES_128_GCM_SHA256');
|
||||
|
||||
$node->append_conf('sslconfig.conf',
|
||||
"ssl_passphrase_command='" . $params{passphrase_cmd} . "'")
|
||||
|
@ -62,8 +62,9 @@ sub process_file
|
||||
|
||||
# skip over commit links because we will add them below
|
||||
next
|
||||
if (!$in_comment &&
|
||||
m{^\s*<ulink url="&commit_baseurl;[[:xdigit:]]+">§</ulink>\s*$});
|
||||
if (!$in_comment
|
||||
&& m{^\s*<ulink url="&commit_baseurl;[[:xdigit:]]+">§</ulink>\s*$}
|
||||
);
|
||||
|
||||
if ($in_comment && m/\[([[:xdigit:]]+)\]/)
|
||||
{
|
||||
@ -73,10 +74,10 @@ sub process_file
|
||||
(!m/^Branch:/) && push(@hashes, $hash);
|
||||
|
||||
# minor release item
|
||||
m/^Branch:/ &&
|
||||
defined($major_version) &&
|
||||
m/_${major_version}_/ &&
|
||||
push(@hashes, $hash);
|
||||
m/^Branch:/
|
||||
&& defined($major_version)
|
||||
&& m/_${major_version}_/
|
||||
&& push(@hashes, $hash);
|
||||
}
|
||||
|
||||
if (!$in_comment && m{</para>})
|
||||
|
@ -49,7 +49,8 @@ while (my $test_src = glob("$src_dir/tests/*.0"))
|
||||
],
|
||||
"pg_bsd_indent succeeds on $test");
|
||||
# check result matches, adding any diff to $diffs_file
|
||||
my $result = run_log([ 'diff', @diffopts, "$test_src.stdout", "$test.out" ],
|
||||
my $result =
|
||||
run_log([ 'diff', @diffopts, "$test_src.stdout", "$test.out" ],
|
||||
'>>', $diffs_file);
|
||||
ok($result, "pg_bsd_indent output matches for $test");
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user