From 728bd093959f0d51c234f88729798165176fc0f6 Mon Sep 17 00:00:00 2001 From: Michael Paquier Date: Fri, 28 Jul 2023 16:53:21 +0900 Subject: [PATCH] Fix pg_rewind with in-place tablespaces when source is remote --- src/bin/pg_rewind/libpq_source.c | 11 ++++++++++- src/bin/pg_rewind/t/001_basic.pl | 20 ++++++++++++++++++++ src/bin/pg_rewind/t/RewindTest.pm | 1 + 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/src/bin/pg_rewind/libpq_source.c b/src/bin/pg_rewind/libpq_source.c index 0d8e9ee2d1..417c74cfef 100644 --- a/src/bin/pg_rewind/libpq_source.c +++ b/src/bin/pg_rewind/libpq_source.c @@ -298,7 +298,16 @@ libpq_traverse_files(rewind_source *source, process_file_callback_t callback) link_target = PQgetvalue(res, i, 3); if (link_target[0]) - type = FILE_TYPE_SYMLINK; + { + /* + * In-place tablespaces are directories located in pg_tblspc/ with + * relative paths. + */ + if (is_absolute_path(link_target)) + type = FILE_TYPE_SYMLINK; + else + type = FILE_TYPE_DIRECTORY; + } else if (isdir) type = FILE_TYPE_DIRECTORY; else diff --git a/src/bin/pg_rewind/t/001_basic.pl b/src/bin/pg_rewind/t/001_basic.pl index 031594e14e..c7b48255a7 100644 --- a/src/bin/pg_rewind/t/001_basic.pl +++ b/src/bin/pg_rewind/t/001_basic.pl @@ -18,6 +18,12 @@ sub run_test RewindTest::setup_cluster($test_mode); RewindTest::start_primary(); + # Create an in-place tablespace with some data on it. + primary_psql("CREATE TABLESPACE space_test LOCATION ''"); + primary_psql("CREATE TABLE space_tbl (d text) TABLESPACE space_test"); + primary_psql( + "INSERT INTO space_tbl VALUES ('in primary, before promotion')"); + # Create a test table and insert a row in primary. primary_psql("CREATE TABLE tbl1 (d text)"); primary_psql("INSERT INTO tbl1 VALUES ('in primary')"); @@ -78,6 +84,13 @@ sub run_test "insert into drop_tbl values ('in primary, after promotion')"); primary_psql("DROP TABLE drop_tbl"); + # Insert some data in the in-place tablespace for the old primary and + # the standby. + primary_psql( + "INSERT INTO space_tbl VALUES ('in primary, after promotion')"); + standby_psql( + "INSERT INTO space_tbl VALUES ('in standby, after promotion')"); + # Before running pg_rewind, do a couple of extra tests with several # option combinations. As the code paths taken by those tests # do not change for the "local" and "remote" modes, just run them @@ -145,6 +158,13 @@ sub run_test RewindTest::run_pg_rewind($test_mode); + check_query( + 'SELECT * FROM space_tbl ORDER BY d', + qq(in primary, before promotion +in standby, after promotion +), + 'table content'); + check_query( 'SELECT * FROM tbl1', qq(in primary diff --git a/src/bin/pg_rewind/t/RewindTest.pm b/src/bin/pg_rewind/t/RewindTest.pm index 4957791e94..8fbbd521cb 100644 --- a/src/bin/pg_rewind/t/RewindTest.pm +++ b/src/bin/pg_rewind/t/RewindTest.pm @@ -131,6 +131,7 @@ sub setup_cluster $node_primary->append_conf( 'postgresql.conf', qq( wal_keep_size = 320MB +allow_in_place_tablespaces = on )); return; } -- 2.40.1