Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit76d2562

Browse files
committed
Merge branch 'REL_2_5'
2 parentseb16026 +de531e6 commit76d2562

File tree

4 files changed

+19
-5
lines changed

4 files changed

+19
-5
lines changed

‎doc/Readme.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33
xmllint --noout --valid probackup.xml
44
xsltproc stylesheet.xsl probackup.xml >pg-probackup.html
55
```
6+
>[!NOTE]
7+
>Install```docbook-xsl``` if you got
8+
>``` "xsl:import : unable to load http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"```

‎doc/pgprobackup.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1970,6 +1970,14 @@ pg_probackup restore -B <replaceable>backup_dir</replaceable> --instance <replac
19701970
for communication between the hosts.
19711971
</para>
19721972
</note>
1973+
<note>
1974+
<para>
1975+
In addition to SSH connection, <application>pg_probackup</application> uses
1976+
a regular connection to the database to manage the remote operation.
1977+
See <xreflinkend="pbk-configuring-the-database-cluster"/> for details of how to set up
1978+
a database connection.
1979+
</para>
1980+
</note>
19731981
<para>
19741982
The typical workflow is as follows:
19751983
</para>

‎src/pg_probackup.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ extern const char *PROGRAM_EMAIL;
110110
/* 64-bit xid support for PGPRO_EE */
111111
#ifndefPGPRO_EE
112112
#defineXID_FMT "%u"
113+
#elif !defined(XID_FMT)
114+
#defineXID_FMT UINT64_FORMAT
113115
#endif
114116

115117
#ifndefSTDIN_FILENO

‎tests/page_test.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
importsubprocess
77
importgzip
88
importshutil
9+
importtime
910

1011
classPageTest(ProbackupTest,unittest.TestCase):
1112

@@ -893,7 +894,7 @@ def test_page_backup_with_alien_wal_segment(self):
893894
"create table t_heap as select i as id, "
894895
"md5(i::text) as text, "
895896
"md5(repeat(i::text,10))::tsvector as tsvector "
896-
"from generate_series(0,1000) i;")
897+
"from generate_series(0,10000) i;")
897898

898899
alien_node.safe_psql(
899900
"postgres",
@@ -905,7 +906,7 @@ def test_page_backup_with_alien_wal_segment(self):
905906
"create table t_heap_alien as select i as id, "
906907
"md5(i::text) as text, "
907908
"md5(repeat(i::text,10))::tsvector as tsvector "
908-
"from generate_series(0,100000) i;")
909+
"from generate_series(0,10000) i;")
909910

910911
# copy latest wal segment
911912
wals_dir=os.path.join(backup_dir,'wal','alien_node')
@@ -916,9 +917,9 @@ def test_page_backup_with_alien_wal_segment(self):
916917
file=os.path.join(wals_dir,filename)
917918
file_destination=os.path.join(
918919
os.path.join(backup_dir,'wal','node'),filename)
919-
#file =os.path.join(wals_dir, '000000010000000000000004')
920-
print(file)
921-
print(file_destination)
920+
start=time.time()
921+
whilenotos.path.exists(file_destination)andtime.time()-start<20:
922+
time.sleep(0.1)
922923
os.remove(file_destination)
923924
os.rename(file,file_destination)
924925

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp