Skip to content

Commit 585a069

Browse files
kulaginmkulaginm
authored
[PBCKP-232] Remove PG-9.5-9.6 support (#523)
* removed support for older versions of postgres (9.5, 9.6) * removed obsolete options (--master-db, --master-host, --master-port, --master-user, --replica-timeout)
1 parent e5b41aa commit 585a069

32 files changed

+479
-1629
lines changed

‎.travis.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ env:
3232
- PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE
3333
- PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE
3434
- PG_VERSION=10 PG_BRANCH=REL_10_STABLE
35-
- PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
36-
- PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
3735
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=archive
3836
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
3937
# - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
@@ -52,7 +50,6 @@ env:
5250
jobs:
5351
allow_failures:
5452
- if: env(PG_BRANCH) = master
55-
- if: env(PG_BRANCH) = REL9_5_STABLE
5653
# - if: env(MODE) IN (archive, backup, delta, locking, merge, replica, retention, restore)
5754

5855
# Only run CI for master branch commits to limit our travis usage

‎Makefile

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,17 @@
1717
# git clone https://github.com/postgrespro/pg_probackup postgresql/contrib/pg_probackup
1818
# cd postgresql
1919
# ./configure ... && make
20-
# make --no-print-directory -C contrib/pg_probackup
20+
# make -C contrib/pg_probackup
2121
#
2222
# 4. out of PG source and without PGXS
2323
# git clone https://git.postgresql.org/git/postgresql.git postgresql-src
2424
# git clone https://github.com/postgrespro/pg_probackup postgresql-src/contrib/pg_probackup
2525
# mkdir postgresql-build && cd postgresql-build
2626
# ../postgresql-src/configure ... && make
27-
# make --no-print-directory -C contrib/pg_probackup
27+
# make -C contrib/pg_probackup
2828
#
2929
top_pbk_srcdir := $(dir $(realpath $(firstword $(MAKEFILE_LIST))))
3030

31-
# get postgres version
32-
PG_MAJORVER != $(MAKE) USE_PGXS=$(USE_PGXS) PG_CONFIG=$(PG_CONFIG) --silent --makefile=$(top_pbk_srcdir)get_pg_version.mk
33-
#$(info Making with PG_MAJORVER=$(PG_MAJORVER))
34-
3531
PROGRAM := pg_probackup
3632

3733
# pg_probackup sources
@@ -46,18 +42,14 @@ OBJS += src/archive.o src/backup.o src/catalog.o src/checkdb.o src/configure.o s
4642
BORROWED_H_SRC := \
4743
src/include/portability/instr_time.h \
4844
src/bin/pg_basebackup/receivelog.h \
49-
src/bin/pg_basebackup/streamutil.h
45+
src/bin/pg_basebackup/streamutil.h \
46+
src/bin/pg_basebackup/walmethods.h
5047
BORROWED_C_SRC := \
5148
src/backend/access/transam/xlogreader.c \
5249
src/backend/utils/hash/pg_crc.c \
5350
src/bin/pg_basebackup/receivelog.c \
54-
src/bin/pg_basebackup/streamutil.c
55-
ifneq ($(PG_MAJORVER), $(findstring $(PG_MAJORVER), 9.5 9.6))
56-
BORROWED_H_SRC += \
57-
src/bin/pg_basebackup/walmethods.h
58-
BORROWED_C_SRC += \
51+
src/bin/pg_basebackup/streamutil.c \
5952
src/bin/pg_basebackup/walmethods.c
60-
endif
6153

6254
OBJS += src/fu_util/impl/ft_impl.o src/fu_util/impl/fo_impl.o
6355

@@ -85,9 +77,6 @@ include $(top_builddir)/src/Makefile.global
8577
include $(top_srcdir)/contrib/contrib-global.mk
8678
endif
8779

88-
# now we can use standard MAJORVERSION variable instead of calculated PG_MAJORVER
89-
undefine PG_MAJORVER
90-
9180
#
9281
PG_CPPFLAGS = -I$(libpq_srcdir) ${PTHREAD_CFLAGS} -I$(top_pbk_srcdir)src -I$(BORROW_DIR)
9382
PG_CPPFLAGS += -I$(top_pbk_srcdir)src/fu_util -Wno-declaration-after-statement
@@ -100,11 +89,8 @@ PG_LIBS_INTERNAL = $(libpq_pgport) ${PTHREAD_CFLAGS}
10089
# additional dependencies on borrowed files
10190
src/archive.o: $(BORROW_DIR)/instr_time.h
10291
src/backup.o src/catchup.o src/pg_probackup.o: $(BORROW_DIR)/streamutil.h
103-
src/stream.o $(BORROW_DIR)/receivelog.o $(BORROW_DIR)/streamutil.o: $(BORROW_DIR)/receivelog.h
104-
ifneq ($(MAJORVERSION), $(findstring $(MAJORVERSION), 9.5 9.6))
92+
src/stream.o $(BORROW_DIR)/receivelog.o $(BORROW_DIR)/streamutil.o $(BORROW_DIR)/walmethods.o: $(BORROW_DIR)/receivelog.h
10593
$(BORROW_DIR)/receivelog.h: $(BORROW_DIR)/walmethods.h
106-
$(BORROW_DIR)/walmethods.o: $(BORROW_DIR)/receivelog.h
107-
endif
10894

10995
# generate separate makefile to handle borrowed files
11096
borrowed.mk: $(firstword $(MAKEFILE_LIST))

‎README.md

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
`pg_probackup` is a utility to manage backup and recovery of PostgreSQL database clusters. It is designed to perform periodic backups of the PostgreSQL instance that enable you to restore the server in case of a failure.
77

88
The utility is compatible with:
9-
* PostgreSQL 9.6, 10, 11, 12, 13, 14;
9+
* PostgreSQL 10, 11, 12, 13, 14;
1010

1111
As compared to other backup solutions, `pg_probackup` offers the following benefits that can help you implement different backup strategies and deal with large amounts of data:
1212
* Incremental backup: page-level incremental backup allows you to save disk space, speed up backup and restore. With three different incremental modes, you can plan the backup strategy in accordance with your data flow.
@@ -74,109 +74,109 @@ Installers are available in release **assets**. [Latests](https://github.com/pos
7474
#DEB Ubuntu|Debian Packages
7575
sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup.list'
7676
sudo wget -O - https://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
77-
sudo apt-get install pg-probackup-{14,13,12,11,10,9.6}
78-
sudo apt-get install pg-probackup-{14,13,12,11,10,9.6}-dbg
77+
sudo apt-get install pg-probackup-{14,13,12,11,10}
78+
sudo apt-get install pg-probackup-{14,13,12,11,10}-dbg
7979

8080
#DEB-SRC Packages
8181
sudo sh -c 'echo "deb-src [arch=amd64] https://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" >>\
8282
/etc/apt/sources.list.d/pg_probackup.list' && sudo apt-get update
83-
sudo apt-get source pg-probackup-{14,13,12,11,10,9.6}
83+
sudo apt-get source pg-probackup-{14,13,12,11,10}
8484

8585
#DEB Astra Linix Orel
8686
sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup/deb/ stretch main-stretch" > /etc/apt/sources.list.d/pg_probackup.list'
8787
sudo wget -O - https://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
88-
sudo apt-get install pg-probackup-{14,13,12,11,10,9.6}{-dbg,}
88+
sudo apt-get install pg-probackup-{14,13,12,11,10}{-dbg,}
8989

9090
#RPM Centos Packages
9191
rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-centos.noarch.rpm
92-
yum install pg_probackup-{14,13,12,11,10,9.6}
93-
yum install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
92+
yum install pg_probackup-{14,13,12,11,10}
93+
yum install pg_probackup-{14,13,12,11,10}-debuginfo
9494

9595
#RPM RHEL Packages
9696
rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-rhel.noarch.rpm
97-
yum install pg_probackup-{14,13,12,11,10,9.6}
98-
yum install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
97+
yum install pg_probackup-{14,13,12,11,10}
98+
yum install pg_probackup-{14,13,12,11,10}-debuginfo
9999

100100
#RPM Oracle Linux Packages
101101
rpm -ivh https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-oraclelinux.noarch.rpm
102-
yum install pg_probackup-{14,13,12,11,10,9.6}
103-
yum install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
102+
yum install pg_probackup-{14,13,12,11,10}
103+
yum install pg_probackup-{14,13,12,11,10}-debuginfo
104104

105105
#SRPM Centos|RHEL|OracleLinux Packages
106-
yumdownloader --source pg_probackup-{14,13,12,11,10,9.6}
106+
yumdownloader --source pg_probackup-{14,13,12,11,10}
107107

108108
#RPM SUSE|SLES Packages
109109
zypper install --allow-unsigned-rpm -y https://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-suse.noarch.rpm
110-
zypper --gpg-auto-import-keys install -y pg_probackup-{14,13,12,11,10,9.6}
111-
zypper install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
110+
zypper --gpg-auto-import-keys install -y pg_probackup-{14,13,12,11,10}
111+
zypper install pg_probackup-{14,13,12,11,10}-debuginfo
112112

113113
#SRPM SUSE|SLES Packages
114-
zypper si pg_probackup-{14,13,12,11,10,9.6}
114+
zypper si pg_probackup-{14,13,12,11,10}
115115

116116
#RPM ALT Linux 7
117117
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p7 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list'
118118
sudo apt-get update
119-
sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}
120-
sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
119+
sudo apt-get install pg_probackup-{14,13,12,11,10}
120+
sudo apt-get install pg_probackup-{14,13,12,11,10}-debuginfo
121121

122122
#RPM ALT Linux 8
123123
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p8 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list'
124124
sudo apt-get update
125-
sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}
126-
sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
125+
sudo apt-get install pg_probackup-{14,13,12,11,10}
126+
sudo apt-get install pg_probackup-{14,13,12,11,10}-debuginfo
127127

128128
#RPM ALT Linux 9
129129
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup/rpm/latest/altlinux-p9 x86_64 vanilla" > /etc/apt/sources.list.d/pg_probackup.list'
130130
sudo apt-get update
131-
sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}
132-
sudo apt-get install pg_probackup-{14,13,12,11,10,9.6}-debuginfo
131+
sudo apt-get install pg_probackup-{14,13,12,11,10}
132+
sudo apt-get install pg_probackup-{14,13,12,11,10}-debuginfo
133133
```
134134

135135
#### pg_probackup for PostgresPro Standard and Enterprise
136136
```shell
137137
#DEB Ubuntu|Debian Packages
138138
sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup-forks/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup-forks.list'
139139
sudo wget -O - https://repo.postgrespro.ru/pg_probackup-forks/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
140-
sudo apt-get install pg-probackup-{std,ent}-{13,12,11,10,9.6}
141-
sudo apt-get install pg-probackup-{std,ent}-{13,12,11,10,9.6}-dbg
140+
sudo apt-get install pg-probackup-{std,ent}-{13,12,11,10}
141+
sudo apt-get install pg-probackup-{std,ent}-{13,12,11,10}-dbg
142142

143143
#DEB Astra Linix Orel
144144
sudo sh -c 'echo "deb [arch=amd64] https://repo.postgrespro.ru/pg_probackup-forks/deb/ stretch main-stretch" > /etc/apt/sources.list.d/pg_probackup.list'
145145
sudo wget -O - https://repo.postgrespro.ru/pg_probackup-forks/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
146-
sudo apt-get install pg-probackup-{std,ent}-{12,11,10,9.6}{-dbg,}
146+
sudo apt-get install pg-probackup-{std,ent}-{12,11,10}{-dbg,}
147147

148148

149149
#RPM Centos Packages
150150
rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-centos.noarch.rpm
151-
yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}
152-
yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
151+
yum install pg_probackup-{std,ent}-{13,12,11,10}
152+
yum install pg_probackup-{std,ent}-{13,12,11,10}-debuginfo
153153

154154
#RPM RHEL Packages
155155
rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-rhel.noarch.rpm
156-
yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}
157-
yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
156+
yum install pg_probackup-{std,ent}-{13,12,11,10}
157+
yum install pg_probackup-{std,ent}-{13,12,11,10}-debuginfo
158158

159159
#RPM Oracle Linux Packages
160160
rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-oraclelinux.noarch.rpm
161-
yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}
162-
yum install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
161+
yum install pg_probackup-{std,ent}-{13,12,11,10}
162+
yum install pg_probackup-{std,ent}-{13,12,11,10}-debuginfo
163163

164164
#RPM ALT Linux 7
165165
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p7 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list'
166166
sudo apt-get update
167-
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}
168-
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
167+
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10}
168+
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10}-debuginfo
169169

170170
#RPM ALT Linux 8
171171
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p8 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list'
172172
sudo apt-get update
173-
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}
174-
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
173+
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10}
174+
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10}-debuginfo
175175

176176
#RPM ALT Linux 9
177177
sudo sh -c 'echo "rpm https://repo.postgrespro.ru/pg_probackup-forks/rpm/latest/altlinux-p9 x86_64 forks" > /etc/apt/sources.list.d/pg_probackup_forks.list' && sudo apt-get update
178-
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}
179-
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10,9.6}-debuginfo
178+
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10}
179+
sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10}-debuginfo
180180
```
181181

182182
Once you have `pg_probackup` installed, complete [the setup](https://postgrespro.github.io/pg_probackup/#pbk-install-and-setup).

‎get_pg_version.mk

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)