Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5a9323e

Browse files
committed
Remove dependency to pageinspect in recovery tests
If contrib/pageinspect is not installed, this causes the test checkingthe minimum recovery point to fail. The point is that the dependencywith pageinspect is not really necessary as the test does also allchecks with an offline cluster by scanning directly the on-disk pages,which is enough for the purpose of the test.Per complaint from Tom Lane.Author: Michael PaquierDiscussion:https://postgr.es/m/17806.1555566345@sss.pgh.pa.us
1 parent75e03ea commit5a9323e

File tree

2 files changed

+3
-43
lines changed

2 files changed

+3
-43
lines changed

‎src/test/recovery/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#
1010
#-------------------------------------------------------------------------
1111

12-
EXTRA_INSTALL=contrib/test_decoding contrib/pageinspect
12+
EXTRA_INSTALL=contrib/test_decoding
1313

1414
subdir = src/test/recovery
1515
top_builddir = ../../..

‎src/test/recovery/t/016_min_consistency.pl

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use warnings;
99
use PostgresNode;
1010
use TestLib;
11-
use Test::Moretests=>2;
11+
use Test::Moretests=>1;
1212

1313
# Find the largest LSN in the set of pages part of the given relation
1414
# file. This is used for offline checks of page consistency. The LSN
@@ -62,32 +62,8 @@ sub find_largest_lsn
6262
$standby->init_from_backup($primary,'bkp',has_streaming=> 1);
6363
$standby->start;
6464

65-
# Object creations for the upcoming tests:
66-
# - Base table whose data consistency is checked.
67-
# - pageinspect to look at the page-level contents.
68-
# - Function wrapper on top of pageinspect to scan a range of pages and
69-
# get the maximum LSN present.
65+
# Create base table whose data consistency is checked.
7066
$primary->safe_psql('postgres',"
71-
CREATE EXTENSION pageinspect;
72-
-- Function wrapper on top of pageinspect which fetches the largest LSN
73-
-- present in the given page range.
74-
CREATE OR REPLACE FUNCTION max_lsn_range(relname text,
75-
start_blk int,
76-
end_blk int)
77-
RETURNS pg_lsn as\$\$
78-
DECLARE
79-
max_lsn pg_lsn = '0/0'::pg_lsn;
80-
cur_lsn pg_lsn;
81-
BEGIN
82-
FOR i IN start_blk..end_blk LOOP
83-
EXECUTE 'SELECT lsn FROM page_header(get_raw_page(''' || relname || ''',' || i || '));' INTO cur_lsn;
84-
IF max_lsn < cur_lsn THEN
85-
max_lsn = cur_lsn;
86-
END IF;
87-
END LOOP;
88-
RETURN max_lsn;
89-
END;
90-
\$\$ LANGUAGE plpgsql;
9167
CREATE TABLE test1 (a int) WITH (fillfactor = 10);
9268
INSERT INTO test1 SELECT generate_series(1, 10000);");
9369

@@ -161,19 +137,3 @@ BEGIN
161137
# the pages on disk.
162138
ok($offline_recovery_lsnge$offline_max_lsn,
163139
"Check offline that table data is consistent with minRecoveryPoint");
164-
165-
# Now restart the standby and check the state of the instance while
166-
# online. Again, all the pages of the relation previously created
167-
# should not have a LSN newer than what minRecoveryPoint has.
168-
$standby->start;
169-
170-
# Check that the last page of the table, which is the last one which
171-
# has been flushed by the previous checkpoint on the standby, does not
172-
# have a LSN newer than minRecoveryPoint.
173-
my$psql_out;
174-
$standby->psql(
175-
'postgres',
176-
"SELECT max_lsn_range('test1', 0,$last_block) <= min_recovery_end_lsn FROM pg_control_recovery()",
177-
stdout=> \$psql_out);
178-
is($psql_out,'t',
179-
"Check online that table data is consistent with minRecoveryPoint");

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp