database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2026-10-23 13:29:09 +03:00
Code Activity

pg_upgrade: Test --check with a running source server

Browse Source 
4fff78f009 has added coverage for pg_upgrade --check, but only after
stopping the source server.  This adds coverage for the case where a
source server is still running, checking for port patterns and a success
case where the old server still runs.

The chdir() required for VPATH builds needs to be moved slightly
earlier, to adapt to the generation of the logs.

Author: Bertrand Drouvot <bertranddrouvot.pg@gmail.com>
Reviewed-by: Ewan Young <kdbase.hack@gmail.com>
Discussion: https://postgr.es/m/apU4/hmRv/4gv20W@bdtpg
This commit is contained in:
Michael Paquier
2026-09-03 17:28:53 +09:00
parent 6fe9b62914
commit 88aa6ca138
1 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/bin/pg_upgrade/t/002_pg_upgrade.pl
View File

@@ -475,6 +475,47 @@ if (defined($ENV{oldinstall}))
}
}
# In a VPATH build, we'll be started in the source directory, but we want
# to run pg_upgrade in the build directory so that any files generated finish
# in it, like delete_old_cluster.{sh,bat}.
chdir ${PostgreSQL::Test::Utils::tmp_check};
my @live_check_command = (
'pg_upgrade', '--no-sync',
'--old-datadir' => $oldnode->data_dir,
'--new-datadir' => $newnode->data_dir,
'--old-bindir' => $oldbindir,
'--new-bindir' => $newbindir,
'--socketdir' => $newnode->host,
'--old-port' => $oldnode->port);
# A live check must use different ports for the running old server and
# the temporary new server.
command_checks_all(
[
@live_check_command,
'--new-port' => $oldnode->port,
$mode, '--check',
],
1,
[
qr/When checking a live server, the old and new port numbers must be different\./
],
[],
'pg_upgrade --check with the same old and new ports');
rmtree($newnode->data_dir . "/pg_upgrade_output.d");
# Check the old cluster while it is running.
command_like(
[
@live_check_command,
'--new-port' => $newnode->port,
$mode, '--check',
],
qr/Performing Consistency Checks on Old Live Server/,
'run of pg_upgrade --check with old instance running');
# Create an invalid database, will be deleted below
$oldnode->safe_psql(
'postgres', qq(
@@ -482,11 +523,6 @@ $oldnode->safe_psql(
UPDATE pg_database SET datconnlimit = -2 WHERE datname = 'regression_invalid';
));
# In a VPATH build, we'll be started in the source directory, but we want
# to run pg_upgrade in the build directory so that any files generated finish
# in it, like delete_old_cluster.{sh,bat}.
chdir ${PostgreSQL::Test::Utils::tmp_check};
# Upgrade the instance.
$oldnode->stop;