Merge branch 'REL_2_5'

postgres-dev · postgres-dev · commit 76d256203994 · 2023-11-24T18:12:32.000+07:00
diff --git a/doc/Readme.md b/doc/Readme.md
@@ -3,3 +3,6 @@
 xmllint --noout --valid probackup.xml
 xsltproc stylesheet.xsl probackup.xml >pg-probackup.html
 ```
+> [!NOTE]
+>Install ```docbook-xsl``` if you got
+>``` "xsl:import : unable to load http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"``` 
diff --git a/doc/pgprobackup.xml b/doc/pgprobackup.xml
@@ -1970,6 +1970,14 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
       for communication between the hosts.
      </para>
     </note>
+    <note>
+      <para>
+       In addition to SSH connection, <application>pg_probackup</application> uses
+       a regular connection to the database to manage the remote operation.
+       See <xref linkend="pbk-configuring-the-database-cluster"/> for details of how to set up
+       a database connection.
+      </para>
+     </note>
     <para>
       The typical workflow is as follows:
     </para>
diff --git a/src/pg_probackup.h b/src/pg_probackup.h
@@ -110,6 +110,8 @@ extern const char  *PROGRAM_EMAIL;
 /* 64-bit xid support for PGPRO_EE */
 #ifndef PGPRO_EE
 #define XID_FMT "%u"
+#elif !defined(XID_FMT)
+#define XID_FMT UINT64_FORMAT
 #endif
 
 #ifndef STDIN_FILENO
diff --git a/tests/page_test.py b/tests/page_test.py
@@ -6,6 +6,7 @@
 import subprocess
 import gzip
 import shutil
+import time
 
 class PageTest(ProbackupTest, unittest.TestCase):
 
@@ -893,7 +894,7 @@ def test_page_backup_with_alien_wal_segment(self):
             "create table t_heap as select i as id, "
             "md5(i::text) as text, "
             "md5(repeat(i::text,10))::tsvector as tsvector "
-            "from generate_series(0,1000) i;")
+            "from generate_series(0,10000) i;")
 
         alien_node.safe_psql(
             "postgres",
@@ -905,7 +906,7 @@ def test_page_backup_with_alien_wal_segment(self):
             "create table t_heap_alien as select i as id, "
             "md5(i::text) as text, "
             "md5(repeat(i::text,10))::tsvector as tsvector "
-            "from generate_series(0,100000) i;")
+            "from generate_series(0,10000) i;")
 
         # copy latest wal segment
         wals_dir = os.path.join(backup_dir, 'wal', 'alien_node')
@@ -916,9 +917,9 @@ def test_page_backup_with_alien_wal_segment(self):
         file = os.path.join(wals_dir, filename)
         file_destination = os.path.join(
             os.path.join(backup_dir, 'wal', 'node'), filename)
-#        file = os.path.join(wals_dir, '000000010000000000000004')
-        print(file)
-        print(file_destination)
+        start = time.time()
+        while not os.path.exists(file_destination) and time.time() - start < 20:
+            time.sleep(0.1)
         os.remove(file_destination)
         os.rename(file, file_destination)
 
