Skip to content

Commit 233a24c

Browse files
arssherarssher
committed
[PGPRO-4074] Port on 13 (and 12).
Includes major part of 778542f8a26577 which is port on 12. A ground for working with vanilla and building outside contrib/ is also prepared, in particular - PGXS build allowing running TAP tests. Notorious regress.pl is skipped in such configuration as we don't have access to tests/schedule in the core build. ATX/pathman dependant tests are covered in is_ee checks as well. - Referee is moved into extension, 'make install' recurses down.
1 parent 66ec127 commit 233a24c

32 files changed

+1541
-1640
lines changed

‎Cluster.pm‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,21 @@ sub init
8080
$binary_basetypes = ($uname_arch =~ m/arm/) ? 0 : 1;
8181
}
8282

83+
my $shared_preload_libraries = 'multimaster';
84+
if (is_ee())
85+
{
86+
$shared_preload_libraries = $shared_preload_libraries . ', pg_pathman';
87+
}
88+
8389
foreach my $node (@$nodes)
8490
{
8591
$node->init(allows_streaming => 'logical');
8692
$node->append_conf('postgresql.conf', qq{
8793
max_connections = 50
88-
log_line_prefix = '%m [%p] %i '
94+
log_line_prefix = '%m [%p] [xid%x] %i '
8995
log_statement = all
9096
91-
shared_preload_libraries = 'multimaster, pg_pathman'
97+
shared_preload_libraries = '${shared_preload_libraries}'
9298
9399
max_prepared_transactions = 250
94100
max_worker_processes = 320
@@ -375,7 +381,18 @@ sub pgbench_async()
375381
sub pgbench_await()
376382
{
377383
my ($self, $pgbench_handle) = @_;
378-
IPC::Run::finish($pgbench_handle) or diag("WARNING: pgbench exited with $?");
384+
IPC::Run::finish($pgbench_handle);
385+
my $exit_code = ($? >> 8);
386+
# XXX: early failure, i.e. connection from the main driver will be caught
387+
# (exit code 1) here: everywhere in tests we assume node is healthy and
388+
# online when pgbench starts. Later, if some connection gets error (which is
389+
# normal once we put node down) it triggers exit code 2. Unfortunately, such
390+
# error stops the connection, i.e. it won't try any more queries -- it would
391+
# be nice to have it continue the bombardment.
392+
if ($exit_code != 0 && $exit_code != 2)
393+
{
394+
diag("WARNING: pgbench exited with $exit_code")
395+
}
379396
note("finished pgbench");
380397
}
381398

@@ -412,6 +429,20 @@ sub is_data_identic()
412429
return 1;
413430
}
414431

432+
# are we dealing with pgproee?
433+
sub is_ee
434+
{
435+
my ($stdout, $stderr);
436+
my $result = IPC::Run::run [ 'pg_config', '--pgpro-edition' ], '>',
437+
\$stdout, '2>', \$stderr;
438+
my $exit_code = ($? >> 8);
439+
if ($exit_code != 0)
440+
{
441+
return 0;
442+
}
443+
return ($stdout =~ m/enterprise/);
444+
}
445+
415446
# Override PostgresNode::start|stop to reserve the port while node is down
416447
{
417448
# otherwise perl whines, thinking our override is redefine

‎Makefile‎

Lines changed: 59 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,56 @@ src/pglogical_relid_map.o src/ddd.o src/bkb.o src/spill.o src/state.o \
77
src/resolver.o src/ddl.o src/syncpoint.o src/global_tx.o
88
MODULE_big = multimaster
99

10-
PG_CPPFLAGS += -I$(libpq_srcdir)
11-
SHLIB_LINK = $(libpq)
10+
ifndef USE_PGXS # hmm, user didn't requested to use pgxs
11+
# relative path to this makefile
12+
mkfile_path := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
13+
# relative path to dir with this makefile
14+
mkfile_dir := $(dir $(mkfile_path))
15+
# abs path to dir with this makefile
16+
mkfile_abspath := $(shell cd $(mkfile_dir) && pwd -P)
17+
# parent dir name of directory with makefile
18+
parent_dir_name := $(shell basename $(shell dirname $(mkfile_abspath)))
19+
ifneq ($(parent_dir_name),contrib) # a-ha, but the extension is not inside 'contrib' dir
20+
USE_PGXS := 1 # so use it anyway, most probably that's what the user wants
21+
endif
22+
endif
23+
# $(info) is introduced in 3.81, and PG doesn't support makes older than 3.80
24+
ifeq ($(MAKE_VERSION),3.80)
25+
$(warning $$USE_PGXS is [${USE_PGXS}] (we use it automatically if not in contrib dir))
26+
else
27+
$(info $$USE_PGXS is [${USE_PGXS}] (we use it automatically if not in contrib dir))
28+
endif
1229

13-
ifdef USE_PGXS
30+
ifdef USE_PGXS # use pgxs
31+
# You can specify path to pg_config in PG_CONFIG var
32+
ifndef PG_CONFIG
33+
PG_CONFIG := pg_config
34+
endif
1435
PG_CPPFLAGS += -I$(CURDIR)/src/include
15-
PG_CONFIG = pg_config
36+
# add installation top include directory for libpq header
37+
# (seems like server/ dir is added by pgxs)
38+
PG_CPPFLAGS += -I$(shell $(PG_CONFIG) --includedir)
39+
SHLIB_LINK += -lpq # add libpq
1640
PGXS := $(shell $(PG_CONFIG) --pgxs)
1741
include $(PGXS)
18-
else
42+
43+
else # assume the extension is in contrib/ dir of pg distribution
44+
# EXTRA_INSTALL=contrib/pg_pathman contrib/referee
1945
PG_CPPFLAGS += -I$(top_srcdir)/$(subdir)/src/include
46+
PG_CPPFLAGS += -I$(libpq_srcdir) # include libpq-fe, defined in Makefile.global.in
47+
SHLIB_LINK = $(libpq) # defined in Makefile.global.in
2048
subdir = contrib/mmts
2149
top_builddir = ../..
2250
include $(top_builddir)/src/Makefile.global
2351
include $(top_srcdir)/contrib/contrib-global.mk
24-
endif
52+
endif # USE_PGXS
2553

2654
.PHONY: all
2755

28-
EXTRA_INSTALL=contrib/pg_pathman contrib/referee
56+
# recurse down to referee/ on install
57+
referee-install:
58+
USE_PGXS=$(USE_PGXS) $(MAKE) -C referee install
59+
install: referee-install
2960

3061
all: multimaster.so
3162

@@ -38,22 +69,38 @@ submake-regress:
3869
# PROVE_TESTS ?=
3970
# endif
4071
PROVE_FLAGS += --timer
72+
ifndef USE_PGXS
4173
check: temp-install submake-regress
4274
$(prove_check)
75+
else # pgxs build
76+
# Note that for PGXS build we override here bail-out recipe defined in pgxs.mk,
77+
# but well, why should we chose another name?
78+
# submake-regress won't work as we have no access to the source; we assume
79+
# regress is already installed
80+
# final spell is inspired by
81+
# https://www.2ndquadrant.com/en/blog/using-postgresql-tap-framework-extensions/
82+
# and Makefile.global.in which is obviously the original source
83+
check:
84+
rm -rf '$(CURDIR)'/tmp_check
85+
$(MKDIR_P) '$(CURDIR)'/tmp_check
86+
PGXS=$(PGXS) TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PG_REGRESS='$(top_builddir)/src/test/regress/pg_regress' $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if $(PROVE_TESTS),$(PROVE_TESTS),t/*.pl)
87+
endif
4388

89+
# PG_PROVE_FLAGS adds PostgresNode and friends include dir
4490
start: temp-install
4591
rm -rf '$(CURDIR)'/tmp_check
4692
$(MKDIR_P) '$(CURDIR)'/tmp_check
4793
cd $(srcdir) && TESTDIR='$(CURDIR)' \
4894
$(with_temp_install) \
49-
PG_REGRESS='$(CURDIR)/$(top_builddir)/src/test/regress/pg_regress' \
50-
perl run.pl --action=start $(RUN_OPTS)
95+
PG_REGRESS='$(top_builddir)/src/test/regress/pg_regress' \
96+
perl $(PG_PROVE_FLAGS) run.pl --action=start $(RUN_OPTS)
5197

5298
stop:
5399
cd $(srcdir) && TESTDIR='$(CURDIR)' \
54-
$(with_temp_install) \
55-
perl run.pl --action=stop $(RUN_OPTS)
100+
PG_REGRESS='$(top_builddir)/src/test/regress/pg_regress' \
101+
perl $(PG_PROVE_FLAGS) run.pl --action=stop $(RUN_OPTS)
56102

103+
# for manual testing: runs core regress tests on 'make start'ed cluster
57104
run-pg-regress: submake-regress
58105
cd $(CURDIR)/$(top_builddir)/src/test/regress && \
59106
$(with_temp_install) \
@@ -67,6 +114,7 @@ run-pg-regress: submake-regress
67114
--dlpath=$(CURDIR)/$(top_builddir)/src/test/regress \
68115
--inputdir=$(abs_top_srcdir)/src/test/regress
69116

117+
# for manual testing: runs contrib/test_partition on 'make start'ed cluster
70118
run-pathman-regress:
71119
cd $(CURDIR)/$(top_builddir)/src/test/regress && \
72120
$(with_temp_install) \

‎expected/atx.out‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
create table atx_test1(a text);
2+
-- check that commit of autonomous tx will not steal locks from parent tx
3+
begin;
4+
insert into atx_test1 values (1);
5+
select count(*) from pg_locks where transactionid=txid_current();
6+
count
7+
-------
8+
1
9+
(1 row)
10+
11+
begin autonomous;
12+
insert into atx_test1 values (1);
13+
select count(*) from pg_locks where transactionid=txid_current();
14+
count
15+
-------
16+
1
17+
(1 row)
18+
19+
commit;
20+
-- here we still should see our lock
21+
select count(*) from pg_locks where transactionid=txid_current();
22+
count
23+
-------
24+
1
25+
(1 row)
26+
27+
commit;
28+
drop table atx_test1;

‎expected/multimaster.out‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -380,34 +380,6 @@ INSERT INTO bmscantest
380380
INSERT INTO bmscantest
381381
SELECT (r%53), (r%59), 'foooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo'
382382
FROM generate_series(1,70000) r;
383-
create table atx_test1(a text);
384-
-- check that commit of autonomous tx will not steal locks from parent tx
385-
begin;
386-
insert into atx_test1 values (1);
387-
select count(*) from pg_locks where transactionid=txid_current();
388-
count
389-
-------
390-
1
391-
(1 row)
392-
393-
begin autonomous;
394-
insert into atx_test1 values (1);
395-
select count(*) from pg_locks where transactionid=txid_current();
396-
count
397-
-------
398-
1
399-
(1 row)
400-
401-
commit;
402-
-- here we still should see our lock
403-
select count(*) from pg_locks where transactionid=txid_current();
404-
count
405-
-------
406-
1
407-
(1 row)
408-
409-
commit;
410-
drop table atx_test1;
411383
-- replication of statements that have estate->es_processed == 0
412384
\c :node1
413385
create table zeroes_test (id integer, comments text);

0 commit comments

Comments
 (0)