Merge remote-tracking branch 'origin/release_2_5_6' into release_2_5_6_PBCKP-128

Author: kulaginm

.travis.yml

@@ -34,21 +34,21 @@ env:
     - PG_VERSION=10 PG_BRANCH=REL_10_STABLE
     - PG_VERSION=9.6 PG_BRANCH=REL9_6_STABLE
     - PG_VERSION=9.5 PG_BRANCH=REL9_5_STABLE
-#    - 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=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_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE MODE=catchup
+    - PG_VERSION=14 PG_BRANCH=REL_14_STABLE PTRACK_PATCH_PG_BRANCH=REL_14_STABLE MODE=catchup
     - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=catchup
-    - PG_VERSION=13 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE MODE=catchup
-    - PG_VERSION=13 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE MODE=catchup
-    - PG_VERSION=13 PG_BRANCH=REL_10_STABLE PTRACK_PATCH_PG_BRANCH=REL_10_STABLE MODE=catchup
-#    - 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
+    - PG_VERSION=12 PG_BRANCH=REL_12_STABLE PTRACK_PATCH_PG_BRANCH=REL_12_STABLE MODE=catchup
+    - PG_VERSION=11 PG_BRANCH=REL_11_STABLE PTRACK_PATCH_PG_BRANCH=REL_11_STABLE MODE=catchup
+    - PG_VERSION=10 PG_BRANCH=REL_10_STABLE PTRACK_PATCH_PG_BRANCH=REL_10_STABLE MODE=catchup
+#    - 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
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=merge
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=page
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=page
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=ptrack
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=replica
-#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=off MODE=retention
+#    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=OFF MODE=retention
 #    - PG_VERSION=13 PG_BRANCH=REL_13_STABLE PTRACK_PATCH_PG_BRANCH=REL_13_STABLE MODE=restore
 
 jobs:

tests/backup.py

@@ -2351,47 +2351,45 @@ def test_backup_with_less_privileges_role(self):
 
         replica.slow_start(replica=True)
 
-        # Archive backups from replica in this test are disabled,
-        # because WAL archiving on replica in idle DB in PostgreSQL is broken:
-        # replica will not archive the previous WAL until it receives new records in the next WAL file,
-        # this "lazy" archiving can be seen in src/backend/replication/walreceiver.c:XLogWalRcvWrite()
-        # (see !XLByteInSeg checking and XLogArchiveNotify() calling).
-        #
         # self.switch_wal_segment(node)
-        #self.backup_node(
-        #    backup_dir, 'replica', replica,
-        #    datname='backupdb', options=['-U', 'backup'])
+        # self.switch_wal_segment(node)
+
+        self.backup_node(
+            backup_dir, 'replica', replica,
+            datname='backupdb', options=['-U', 'backup'])
 
         # stream full backup from replica
         self.backup_node(
             backup_dir, 'replica', replica,
             datname='backupdb', options=['--stream', '-U', 'backup'])
 
+#        self.switch_wal_segment(node)
+
         # PAGE backup from replica
-        #self.switch_wal_segment(node)
-        #self.backup_node(
-        #    backup_dir, 'replica', replica, backup_type='page',
-        #    datname='backupdb', options=['-U', 'backup', '--archive-timeout=30s'])
+        self.switch_wal_segment(node)
+        self.backup_node(
+            backup_dir, 'replica', replica, backup_type='page',
+            datname='backupdb', options=['-U', 'backup', '--archive-timeout=30s'])
 
         self.backup_node(
             backup_dir, 'replica', replica, backup_type='page',
             datname='backupdb', options=['--stream', '-U', 'backup'])
 
         # DELTA backup from replica
-        #self.switch_wal_segment(node)
-        #self.backup_node(
-        #    backup_dir, 'replica', replica, backup_type='delta',
-        #    datname='backupdb', options=['-U', 'backup'])
+        self.switch_wal_segment(node)
+        self.backup_node(
+            backup_dir, 'replica', replica, backup_type='delta',
+            datname='backupdb', options=['-U', 'backup'])
         self.backup_node(
             backup_dir, 'replica', replica, backup_type='delta',
             datname='backupdb', options=['--stream', '-U', 'backup'])
 
         # PTRACK backup from replica
         if self.ptrack:
-            #self.switch_wal_segment(node)
-            #self.backup_node(
-            #    backup_dir, 'replica', replica, backup_type='ptrack',
-            #    datname='backupdb', options=['-U', 'backup'])
+            self.switch_wal_segment(node)
+            self.backup_node(
+                backup_dir, 'replica', replica, backup_type='ptrack',
+                datname='backupdb', options=['-U', 'backup'])
             self.backup_node(
                 backup_dir, 'replica', replica, backup_type='ptrack',
                 datname='backupdb', options=['--stream', '-U', 'backup'])

tests/replica.py

@@ -291,16 +291,6 @@ def test_replica_archive_page_backup(self):
 
         self.wait_until_replica_catch_with_master(master, replica)
 
-        master.pgbench_init(scale=5)
-        # Continuous making some changes on master,
-        # because WAL archiving on replica in idle DB in PostgreSQL is broken:
-        # replica will not archive the previous WAL until it receives new records in the next WAL file,
-        # this "lazy" archiving can be seen in src/backend/replication/walreceiver.c:XLogWalRcvWrite()
-        # (see !XLByteInSeg checking and XLogArchiveNotify() calling).
-        pgbench = master.pgbench(
-            stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
-            options=['-T', '3', '-c', '1', '--no-vacuum'])
-
         backup_id = self.backup_node(
             backup_dir, 'replica', replica,
             options=[
@@ -309,9 +299,6 @@ def test_replica_archive_page_backup(self):
                 '--master-db=postgres',
                 '--master-port={0}'.format(master.port)])
 
-        pgbench.wait()
-        pgbench.stdout.close()
-
         self.validate_pb(backup_dir, 'replica')
         self.assertEqual(
             'OK', self.show_pb(backup_dir, 'replica', backup_id)['status'])
@@ -334,6 +321,8 @@ def test_replica_archive_page_backup(self):
         # Change data on master, make PAGE backup from replica,
         # restore taken backup and check that restored data equal
         # to original data
+        master.pgbench_init(scale=5)
+
         pgbench = master.pgbench(
             options=['-T', '30', '-c', '2', '--no-vacuum'])
 

travis/make_dockerfile.sh

@@ -15,7 +15,7 @@ if [ -z ${MODE+x} ]; then
 fi
 
 if [ -z ${PTRACK_PATCH_PG_BRANCH+x} ]; then
-	PTRACK_PATCH_PG_BRANCH=off
+	PTRACK_PATCH_PG_BRANCH=OFF
 fi
 
 if [ -z ${PGPROBACKUP_GDB+x} ]; then

travis/run_tests.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #
-# Copyright (c) 2019-2020, Postgres Professional
+# Copyright (c) 2019-2022, Postgres Professional
 #
 set -xe
 
@@ -33,18 +33,18 @@ echo "############### Getting Postgres sources:"
 git clone https://github.com/postgres/postgres.git -b $PG_BRANCH --depth=1
 
 # Clone ptrack
-if [ "$PTRACK_PATCH_PG_BRANCH" != "off" ]; then
+if [ "$PTRACK_PATCH_PG_BRANCH" != "OFF" ]; then
     git clone https://github.com/postgrespro/ptrack.git -b master --depth=1
-    export PG_PROBACKUP_PTRACK=on
+    export PG_PROBACKUP_PTRACK=ON
 else
-    export PG_PROBACKUP_PTRACK=off
+    export PG_PROBACKUP_PTRACK=OFF
 fi
 
 
 # Compile and install Postgres
 echo "############### Compiling Postgres:"
 cd postgres # Go to postgres dir
-if [ "$PG_PROBACKUP_PTRACK" = "on" ]; then
+if [ "$PG_PROBACKUP_PTRACK" = "ON" ]; then
     git apply -3 ../ptrack/patches/${PTRACK_PATCH_PG_BRANCH}-ptrack-core.diff
 fi
 CFLAGS="-O0" ./configure --prefix=$PGHOME --enable-debug --enable-cassert --enable-depend --enable-tap-tests
@@ -59,7 +59,7 @@ export PATH=$PGHOME/bin:$PATH
 export LD_LIBRARY_PATH=$PGHOME/lib
 export PG_CONFIG=$(which pg_config)
 
-if [ "$PG_PROBACKUP_PTRACK" = "on" ]; then
+if [ "$PG_PROBACKUP_PTRACK" = "ON" ]; then
     echo "############### Compiling Ptrack:"
     make USE_PGXS=1 -C ../ptrack install
 fi