Merge branch 'REL_2_5' before PBCKP-146 into try-merge-2.6

Author: funny-falcon

.travis.yml

@@ -26,7 +26,8 @@ notifications:
 
 # Default MODE is basic, i.e. all tests with PG_PROBACKUP_TEST_BASIC=ON
 env:
-    - PG_VERSION=15 PG_BRANCH=master PTRACK_PATCH_PG_BRANCH=master
+    - PG_VERSION=16 PG_BRANCH=master PTRACK_PATCH_PG_BRANCH=master
+    - PG_VERSION=15 PG_BRANCH=REL_15_STABLE PTRACK_PATCH_PG_BRANCH=REL_15_STABLE
     - PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE
     - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE
     - PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE
@@ -35,6 +36,7 @@ env:
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=archive
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=backup
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=checkdb
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=compression
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=delta
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=locking
@@ -50,7 +52,7 @@ env:
 jobs:
     allow_failures:
         - if: env(PG_BRANCH) = master
-#        - if: env(MODE) IN (archive, backup, delta, locking, merge, replica, retention, restore)
+#       - if: env(MODE) IN (archive, backup, delta, locking, merge, replica, retention, restore)
 
 # Only run CI for master branch commits to limit our travis usage
 #branches:

README.md

@@ -6,7 +6,7 @@
 `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.
 
 The utility is compatible with:
-* PostgreSQL 10, 11, 12, 13, 14;
+* PostgreSQL 10, 11, 12, 13, 14, 15;
 
 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:
 * 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.
@@ -41,9 +41,9 @@ Regardless of the chosen backup type, all backups taken with `pg_probackup` supp
 ## ptrack support
 
 `PTRACK` backup support provided via following options:
-* vanilla PostgreSQL 11, 12, 13, 14 with [ptrack extension](https://github.com/postgrespro/ptrack)
-* Postgres Pro Standard 11, 12, 13
-* Postgres Pro Enterprise 11, 12, 13
+* vanilla PostgreSQL 11, 12, 13, 14, 15 with [ptrack extension](https://github.com/postgrespro/ptrack)
+* Postgres Pro Standard 11, 12, 13, 14
+* Postgres Pro Enterprise 11, 12, 13, 14
 
 ## Limitations
 
@@ -137,8 +137,8 @@ sudo apt-get install pg_probackup-{14,13,12,11,10}-debuginfo
 #DEB Ubuntu|Debian Packages
 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'
 sudo wget -O - https://repo.postgrespro.ru/pg_probackup-forks/keys/GPG-KEY-PG_PROBACKUP | sudo apt-key add - && sudo apt-get update
-sudo apt-get install pg-probackup-{std,ent}-{13,12,11,10}
-sudo apt-get install pg-probackup-{std,ent}-{13,12,11,10}-dbg
+sudo apt-get install pg-probackup-{std,ent}-{14,13,12,11,10}
+sudo apt-get install pg-probackup-{std,ent}-{14,13,12,11,10}-dbg
 
 #DEB Astra Linix Orel
 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'
@@ -148,35 +148,35 @@ sudo apt-get install pg-probackup-{std,ent}-{12,11,10}{-dbg,}
 
 #RPM Centos Packages
 rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-centos.noarch.rpm
-yum install pg_probackup-{std,ent}-{13,12,11,10}
-yum install pg_probackup-{std,ent}-{13,12,11,10}-debuginfo
+yum install pg_probackup-{std,ent}-{14,13,12,11,10}
+yum install pg_probackup-{std,ent}-{14,13,12,11,10}-debuginfo
 
 #RPM RHEL Packages
 rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-rhel.noarch.rpm
-yum install pg_probackup-{std,ent}-{13,12,11,10}
-yum install pg_probackup-{std,ent}-{13,12,11,10}-debuginfo
+yum install pg_probackup-{std,ent}-{14,13,12,11,10}
+yum install pg_probackup-{std,ent}-{14,13,12,11,10}-debuginfo
 
 #RPM Oracle Linux Packages
 rpm -ivh https://repo.postgrespro.ru/pg_probackup-forks/keys/pg_probackup-repo-forks-oraclelinux.noarch.rpm
-yum install pg_probackup-{std,ent}-{13,12,11,10}
-yum install pg_probackup-{std,ent}-{13,12,11,10}-debuginfo
+yum install pg_probackup-{std,ent}-{14,13,12,11,10}
+yum install pg_probackup-{std,ent}-{14,13,12,11,10}-debuginfo
 
 #RPM ALT Linux 7
 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'
 sudo apt-get update
-sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10}
-sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10}-debuginfo
+sudo apt-get install pg_probackup-{std,ent}-{14,13,12,11,10}
+sudo apt-get install pg_probackup-{std,ent}-{14,13,12,11,10}-debuginfo
 
 #RPM ALT Linux 8
 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'
 sudo apt-get update
-sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10}
-sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10}-debuginfo
+sudo apt-get install pg_probackup-{std,ent}-{14,13,12,11,10}
+sudo apt-get install pg_probackup-{std,ent}-{14,13,12,11,10}-debuginfo
 
 #RPM ALT Linux 9
 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
-sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10}
-sudo apt-get install pg_probackup-{std,ent}-{13,12,11,10}-debuginfo
+sudo apt-get install pg_probackup-{std,ent}-{14,13,12,11,10}
+sudo apt-get install pg_probackup-{std,ent}-{14,13,12,11,10}-debuginfo
 ```
 
 Once you have `pg_probackup` installed, complete [the setup](https://postgrespro.github.io/pg_probackup/#pbk-install-and-setup).

doc/pgprobackup.xml

@@ -618,7 +618,7 @@ GRANT EXECUTE ON FUNCTION pg_catalog.pg_control_checkpoint() TO backup;
 COMMIT;
 </programlisting>
     <para>
-      For <productname>PostgreSQL</productname> 10 or higher:
+      For <productname>PostgreSQL</productname> 10:
     </para>
     <programlisting>
 BEGIN;
@@ -637,6 +637,27 @@ GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup;
 GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;
 GRANT EXECUTE ON FUNCTION pg_catalog.pg_control_checkpoint() TO backup;
 COMMIT;
+</programlisting>
+    <para>
+      For <productname>PostgreSQL</productname> 15 or higher:
+    </para>
+    <programlisting>
+BEGIN;
+CREATE ROLE backup WITH LOGIN;
+GRANT USAGE ON SCHEMA pg_catalog TO backup;
+GRANT EXECUTE ON FUNCTION pg_catalog.current_setting(text) TO backup;
+GRANT EXECUTE ON FUNCTION pg_catalog.set_config(text, text, boolean) TO backup;
+GRANT EXECUTE ON FUNCTION pg_catalog.pg_is_in_recovery() TO backup;
+GRANT EXECUTE ON FUNCTION pg_catalog.pg_backup_start(text, boolean) TO backup;
+GRANT EXECUTE ON FUNCTION pg_catalog.pg_backup_stop(boolean) TO backup;
+GRANT EXECUTE ON FUNCTION pg_catalog.pg_create_restore_point(text) TO backup;
+GRANT EXECUTE ON FUNCTION pg_catalog.pg_switch_wal() TO backup;
+GRANT EXECUTE ON FUNCTION pg_catalog.pg_last_wal_replay_lsn() TO backup;
+GRANT EXECUTE ON FUNCTION pg_catalog.txid_current() TO backup;
+GRANT EXECUTE ON FUNCTION pg_catalog.txid_current_snapshot() TO backup;
+GRANT EXECUTE ON FUNCTION pg_catalog.txid_snapshot_xmax(txid_snapshot) TO backup;
+GRANT EXECUTE ON FUNCTION pg_catalog.pg_control_checkpoint() TO backup;
+COMMIT;
 </programlisting>
     <para>
       In the

packaging/Makefile.test

@@ -130,10 +130,10 @@ build/test_suse: build/test_suse_15.1 build/test_suse_15.2
 	@echo Suse: done
 
 build/test_suse_15.1: build/test_suse_15.1_9.6 build/test_suse_15.1_10 build/test_suse_15.1_11 build/test_suse_15.1_12 build/test_suse_15.1_13
-	@echo Rhel 15.1: done
+	@echo Suse 15.1: done
 
 build/test_suse_15.2: build/test_suse_15.2_9.6 build/test_suse_15.2_10 build/test_suse_15.2_11 build/test_suse_15.2_12 build/test_suse_15.2_13 build/test_suse_15.2_14
-	@echo Rhel 15.1: done
+	@echo Suse 15.2: done
 
 define test_suse
 	docker rm -f $1_$2_probackup_$(PKG_NAME_SUFFIX)$(PBK_VERSION) >> /dev/null 2>&1 ; \

packaging/test/scripts/rpm.sh

@@ -77,6 +77,12 @@ if [ ${DISTRIB} == 'centos' ] && [ ${DISTRIB_VERSION} == '8' ]; then
     dnf -qy module disable postgresql
 fi
 
+# PGDG doesn't support install of PG-9.6 from repo package anymore
+if [ ${PG_VERSION} == '9.6' ] && [ ${DISTRIB_VERSION} == '7' ]; then
+    # ugly hack: use repo settings from PG10
+    sed -i 's/10/9.6/' /etc/yum.repos.d/pgdg-redhat-all.repo
+fi
+
 yum install -y postgresql${PG_TOG}-server.x86_64
 export PGDATA=/var/lib/pgsql/${PG_VERSION}/data
 

src/backup.c

@@ -923,10 +923,21 @@ check_server_version(PGconn *conn, PGNodeInfo *nodeInfo)
 	 */
 #ifdef PGPRO_VERSION
 	if (!res)
+	{
 		/* It seems we connected to PostgreSQL (not Postgres Pro) */
-		elog(ERROR, "%s was built with Postgres Pro %s %s, "
-					"but connection is made with PostgreSQL %s",
-			 PROGRAM_NAME, PG_MAJORVERSION, PGPRO_EDITION, nodeInfo->server_version_str);
+		if(strcmp(PGPRO_EDITION, "1C") != 0)
+		{
+			elog(ERROR, "%s was built with Postgres Pro %s %s, "
+						"but connection is made with PostgreSQL %s",
+				 PROGRAM_NAME, PG_MAJORVERSION, PGPRO_EDITION, nodeInfo->server_version_str);
+		}
+		/* We have PostgresPro for 1C and connect to PostgreSQL or PostgresPro for 1C
+		 * Check the major version
+		*/
+		if (strcmp(nodeInfo->server_version_str, PG_MAJORVERSION) != 0)
+			elog(ERROR, "%s was built with PostgrePro %s %s, but connection is made with %s",
+				 PROGRAM_NAME, PG_MAJORVERSION, PGPRO_EDITION, nodeInfo->server_version_str);
+	}
 	else
 	{
 		if (strcmp(nodeInfo->server_version_str, PG_MAJORVERSION) != 0 &&
@@ -1030,12 +1041,20 @@ pg_start_backup(const char *label, bool smooth, pgBackup *backup,
 	uint32		lsn_lo;
 	params[0] = label;
 
+#if PG_VERSION_NUM >= 150000
+	elog(INFO, "wait for pg_backup_start()");
+#else
 	elog(INFO, "wait for pg_start_backup()");
+#endif
 
 	/* 2nd argument is 'fast'*/
 	params[1] = smooth ? "false" : "true";
 	res = pgut_execute(conn,
+#if PG_VERSION_NUM >= 150000
+					   "SELECT pg_catalog.pg_backup_start($1, $2)",
+#else
 					   "SELECT pg_catalog.pg_start_backup($1, $2, false)",
+#endif
 					   2,
 					   params);
 
@@ -1575,6 +1594,14 @@ pg_stop_backup_send(PGconn *conn, int server_version, bool is_started_on_replica
 			" labelfile,"
 			" spcmapfile"
 			" FROM pg_catalog.pg_stop_backup(false, false)",
+		stop_backup_on_master_after15_query[] =
+			"SELECT"
+			" pg_catalog.txid_snapshot_xmax(pg_catalog.txid_current_snapshot()),"
+			" current_timestamp(0)::timestamptz,"
+			" lsn,"
+			" labelfile,"
+			" spcmapfile"
+			" FROM pg_catalog.pg_backup_stop(false)",
 		/*
 		 * In case of backup from replica we do not trust minRecPoint
 		 * and stop_backup LSN, so we use latest replayed LSN as STOP LSN.
@@ -1586,12 +1613,26 @@ pg_stop_backup_send(PGconn *conn, int server_version, bool is_started_on_replica
 			" pg_catalog.pg_last_wal_replay_lsn(),"
 			" labelfile,"
 			" spcmapfile"
-			" FROM pg_catalog.pg_stop_backup(false, false)";
+			" FROM pg_catalog.pg_stop_backup(false, false)",
+		stop_backup_on_replica_after15_query[] =
+			"SELECT"
+			" pg_catalog.txid_snapshot_xmax(pg_catalog.txid_current_snapshot()),"
+			" current_timestamp(0)::timestamptz,"
+			" pg_catalog.pg_last_wal_replay_lsn(),"
+			" labelfile,"
+			" spcmapfile"
+			" FROM pg_catalog.pg_backup_stop(false)";
 
 	const char * const stop_backup_query =
-				is_started_on_replica ?
+			server_version >= 150000 ?
+				(is_started_on_replica ?
+					stop_backup_on_replica_after15_query :
+					stop_backup_on_master_after15_query
+				) :
+				(is_started_on_replica ?
 					stop_backup_on_replica_query :
-					stop_backup_on_master_query;
+					stop_backup_on_master_query
+				);
 	bool		sent = false;
 
 	/* Make proper timestamp format for parse_time(recovery_time) */
@@ -1606,7 +1647,11 @@ pg_stop_backup_send(PGconn *conn, int server_version, bool is_started_on_replica
 	 */
 	sent = pgut_send(conn, stop_backup_query, 0, NULL, WARNING);
 	if (!sent)
+#if PG_VERSION_NUM >= 150000
+		elog(ERROR, "Failed to send pg_backup_stop query");
+#else
 		elog(ERROR, "Failed to send pg_stop_backup query");
+#endif
 
 	/* After we have sent pg_stop_backup, we don't need this callback anymore */
 	pgut_atexit_pop(backup_stopbackup_callback, &stop_callback_params);
@@ -1652,7 +1697,11 @@ pg_stop_backup_consume(PGconn *conn, int server_version,
 			if (interrupted)
 			{
 				pgut_cancel(conn);
+#if PG_VERSION_NUM >= 150000
+				elog(ERROR, "interrupted during waiting for pg_backup_stop");
+#else
 				elog(ERROR, "interrupted during waiting for pg_stop_backup");
+#endif
 			}
 
 			if (pg_stop_backup_timeout == 1)
@@ -1665,7 +1714,11 @@ pg_stop_backup_consume(PGconn *conn, int server_version,
 			if (pg_stop_backup_timeout > timeout)
 			{
 				pgut_cancel(conn);
+#if PG_VERSION_NUM >= 150000
+				elog(ERROR, "pg_backup_stop doesn't answer in %d seconds, cancel it", timeout);
+#else
 				elog(ERROR, "pg_stop_backup doesn't answer in %d seconds, cancel it", timeout);
+#endif
 			}
 		}
 		else
@@ -1677,7 +1730,11 @@ pg_stop_backup_consume(PGconn *conn, int server_version,
 
 	/* Check successfull execution of pg_stop_backup() */
 	if (!query_result)
+#if PG_VERSION_NUM >= 150000
+		elog(ERROR, "pg_backup_stop() failed");
+#else
 		elog(ERROR, "pg_stop_backup() failed");
+#endif
 	else
 	{
 		switch (PQresultStatus(query_result))

src/checkdb.c

@@ -461,7 +461,9 @@ get_index_list(const char *dbname, bool first_db_with_amcheck,
 									"LEFT JOIN pg_catalog.pg_class cls ON idx.indexrelid=cls.oid "
 									"LEFT JOIN pg_catalog.pg_namespace nmspc ON cls.relnamespace=nmspc.oid "
 									"LEFT JOIN pg_catalog.pg_am am ON cls.relam=am.oid "
-									"WHERE am.amname='btree' AND cls.relpersistence != 't' "
+									"WHERE am.amname='btree' "
+									"AND cls.relpersistence != 't' "
+									"AND cls.relkind != 'I' "
 									"ORDER BY nmspc.nspname DESC",
 									0, NULL);
 	}
@@ -473,8 +475,10 @@ get_index_list(const char *dbname, bool first_db_with_amcheck,
 									"LEFT JOIN pg_catalog.pg_class cls ON idx.indexrelid=cls.oid "
 									"LEFT JOIN pg_catalog.pg_namespace nmspc ON cls.relnamespace=nmspc.oid "
 									"LEFT JOIN pg_catalog.pg_am am ON cls.relam=am.oid "
-									"WHERE am.amname='btree' AND cls.relpersistence != 't' AND "
-									"(cls.reltablespace IN "
+									"WHERE am.amname='btree' "
+									"AND cls.relpersistence != 't' "
+									"AND cls.relkind != 'I' "
+									"AND (cls.reltablespace IN "
 									"(SELECT oid from pg_catalog.pg_tablespace where spcname <> 'pg_global') "
 									"OR cls.reltablespace = 0) "
 									"ORDER BY nmspc.nspname DESC",