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

Commitec8d9b8

Browse files
committed
ptrack page header fix
1 parentaf29599 commitec8d9b8

16 files changed

+125
-175
lines changed

‎tests/backup_test.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ def __init__(self, *args, **kwargs):
1717
deftest_backup_modes_archive(self):
1818
"""standart backup modes with ARCHIVE WAL method"""
1919
fname=self.id().split('.')[3]
20-
print'{0} started'.format(fname)
2120
node=self.make_simple_node(base_dir="tmp_dirs/backup/{0}".format(fname),
2221
set_archiving=True,
2322
initdb_params=['--data-checksums'],
@@ -74,7 +73,6 @@ def test_backup_modes_archive(self):
7473
deftest_smooth_checkpoint(self):
7574
"""full backup with smooth checkpoint"""
7675
fname=self.id().split('.')[3]
77-
print'{0} started'.format(fname)
7876
node=self.make_simple_node(base_dir="tmp_dirs/backup/{0}".format(fname),
7977
set_archiving=True,
8078
initdb_params=['--data-checksums'],
@@ -94,7 +92,6 @@ def test_smooth_checkpoint(self):
9492
deftest_page_backup_without_full(self):
9593
"""page-level backup without validated full backup"""
9694
fname=self.id().split('.')[3]
97-
print'{0} started'.format(fname)
9895
node=self.make_simple_node(base_dir="tmp_dirs/backup/{0}".format(fname),
9996
set_archiving=True,
10097
initdb_params=['--data-checksums'],
@@ -114,10 +111,12 @@ def test_page_backup_without_full(self):
114111
# @unittest.skip("123")
115112
deftest_ptrack_threads(self):
116113
"""ptrack multi thread backup mode"""
117-
node=self.make_bnode(
118-
base_dir="tmp_dirs/backup/ptrack_threads_4",
119-
options={"ptrack_enable":"on",'max_wal_senders':'2'}
120-
)
114+
fname=self.id().split('.')[3]
115+
node=self.make_simple_node(base_dir="tmp_dirs/backup/{0}".format(fname),
116+
set_archiving=True,
117+
initdb_params=['--data-checksums'],
118+
pg_options={'wal_level':'replica','ptrack_enable':'on','max_wal_senders':'2'}
119+
)
121120
node.start()
122121
self.assertEqual(self.init_pb(node),six.b(""))
123122

@@ -137,7 +136,6 @@ def test_ptrack_threads(self):
137136
deftest_ptrack_threads_stream(self):
138137
"""ptrack multi thread backup mode and stream"""
139138
fname=self.id().split('.')[3]
140-
print'{0} started'.format(fname)
141139
node=self.make_simple_node(base_dir="tmp_dirs/backup/{0}".format(fname),
142140
set_replication=True,
143141
initdb_params=['--data-checksums'],

‎tests/expected/option_help.out

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
pg_probackup - utility to manage backup/recovery of PostgreSQL database.
33

4-
pg_probackup help
4+
pg_probackup help [COMMAND]
55

66
pg_probackup version
77

@@ -21,20 +21,20 @@ pg_probackup - utility to manage backup/recovery of PostgreSQL database.
2121
[-d dbname] [-h host] [-p port] [-U username]
2222

2323
pg_probackup restore -B backup-dir
24-
[-D pgdata-dir] [-i backup-id]
24+
[-D pgdata-dir] [-i backup-id] [--progress] [-q] [-v]
2525
[--time=time|--xid=xid [--inclusive=boolean]]
2626
[--timeline=timeline] [-T OLDDIR=NEWDIR]
2727

2828
pg_probackup validate -B backup-dir
29-
[-D pgdata-dir] [-i backup-id]
29+
[-D pgdata-dir] [-i backup-id] [--progress] [-q] [-v]
3030
[--time=time|--xid=xid [--inclusive=boolean]]
31-
[--timeline=timeline] [-T OLDDIR=NEWDIR]
31+
[--timeline=timeline]
3232

3333
pg_probackup show -B backup-dir
3434
[-i backup-id]
3535

3636
pg_probackup delete -B backup-dir
37-
[--wal] [-i backup-id | --expired] [--force]
37+
[--wal] [-i backup-id | --expired]
3838

3939
Read the website for details. <https://github.com/postgrespro/pg_probackup>
4040
Report bugs to <https://github.com/postgrespro/pg_probackup/issues>.

‎tests/expected/option_version.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
pg_probackup 1.1.11
1+
pg_probackup 1.1.11

‎tests/ptrack_clean.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ def __init__(self, *args, **kwargs):
99
super(SimpleTest,self).__init__(*args,**kwargs)
1010

1111
defteardown(self):
12-
# clean_all()
1312
stop_all()
1413

15-
# @unittest.skip("123")
14+
# @unittest.skip("skip")
15+
# @unittest.expectedFailure
1616
deftest_ptrack_clean(self):
1717
fname=self.id().split('.')[3]
1818
node=self.make_simple_node(base_dir='tmp_dirs/ptrack/{0}'.format(fname),
@@ -45,7 +45,7 @@ def test_ptrack_clean(self):
4545
idx_ptrack[i]['path']=self.get_fork_path(node,i)
4646
# get ptrack for every idx
4747
idx_ptrack[i]['ptrack']=self.get_ptrack_bits_per_page_for_fork(
48-
idx_ptrack[i]['path'],idx_ptrack[i]['size'])
48+
node,idx_ptrack[i]['path'],idx_ptrack[i]['size'])
4949
self.check_ptrack_clean(idx_ptrack[i],idx_ptrack[i]['size'])
5050

5151
# Update everything, vacuum it and make PTRACK BACKUP
@@ -62,7 +62,7 @@ def test_ptrack_clean(self):
6262
idx_ptrack[i]['path']=self.get_fork_path(node,i)
6363
# # get ptrack for every idx
6464
idx_ptrack[i]['ptrack']=self.get_ptrack_bits_per_page_for_fork(
65-
idx_ptrack[i]['path'],idx_ptrack[i]['size'])
65+
node,idx_ptrack[i]['path'],idx_ptrack[i]['size'])
6666
# check that ptrack bits are cleaned
6767
self.check_ptrack_clean(idx_ptrack[i],idx_ptrack[i]['size'])
6868

@@ -81,7 +81,7 @@ def test_ptrack_clean(self):
8181
idx_ptrack[i]['path']=self.get_fork_path(node,i)
8282
# # get ptrack for every idx
8383
idx_ptrack[i]['ptrack']=self.get_ptrack_bits_per_page_for_fork(
84-
idx_ptrack[i]['path'],idx_ptrack[i]['size'])
84+
node,idx_ptrack[i]['path'],idx_ptrack[i]['size'])
8585
# check that ptrack bits are cleaned
8686
self.check_ptrack_clean(idx_ptrack[i],idx_ptrack[i]['size'])
8787

‎tests/ptrack_cluster.py

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@ def teardown(self):
1212
# clean_all()
1313
stop_all()
1414

15-
# @unittest.skip("123")
15+
# @unittest.skip("123")
1616
deftest_ptrack_cluster_btree(self):
1717
fname=self.id().split('.')[3]
18-
print'{0} started'.format(fname)
1918
node=self.make_simple_node(base_dir="tmp_dirs/ptrack/{0}".format(fname),
2019
set_replication=True,
2120
initdb_params=['--data-checksums','-A trust'],
@@ -63,18 +62,17 @@ def test_ptrack_cluster_btree(self):
6362
idx_ptrack[i]['path'],idx_ptrack[i]['new_size'])
6463
# get ptrack for every idx
6564
idx_ptrack[i]['ptrack']=self.get_ptrack_bits_per_page_for_fork(
66-
idx_ptrack[i]['path'],idx_ptrack[i]['new_size'])
65+
node,idx_ptrack[i]['path'],idx_ptrack[i]['new_size'])
6766

6867
# compare pages and check ptrack sanity
6968
self.check_ptrack_sanity(idx_ptrack[i])
7069

7170
self.clean_pb(node)
7271
node.stop()
7372

74-
@unittest.skip("123")
73+
#@unittest.skip("123")
7574
deftest_ptrack_cluster_spgist(self):
7675
fname=self.id().split('.')[3]
77-
print'{0} started'.format(fname)
7876
node=self.make_simple_node(base_dir="tmp_dirs/ptrack/{0}".format(fname),
7977
set_replication=True,
8078
initdb_params=['--data-checksums','-A trust'],
@@ -122,18 +120,17 @@ def test_ptrack_cluster_spgist(self):
122120
idx_ptrack[i]['path'],idx_ptrack[i]['new_size'])
123121
# get ptrack for every idx
124122
idx_ptrack[i]['ptrack']=self.get_ptrack_bits_per_page_for_fork(
125-
idx_ptrack[i]['path'],idx_ptrack[i]['new_size'])
123+
node,idx_ptrack[i]['path'],idx_ptrack[i]['new_size'])
126124

127125
# compare pages and check ptrack sanity
128126
self.check_ptrack_sanity(idx_ptrack[i])
129127

130128
self.clean_pb(node)
131129
node.stop()
132130

133-
@unittest.skip("123")
131+
#@unittest.skip("123")
134132
deftest_ptrack_cluster_brin(self):
135133
fname=self.id().split('.')[3]
136-
print'{0} started'.format(fname)
137134
node=self.make_simple_node(base_dir="tmp_dirs/ptrack/{0}".format(fname),
138135
set_replication=True,
139136
initdb_params=['--data-checksums','-A trust'],
@@ -181,18 +178,17 @@ def test_ptrack_cluster_brin(self):
181178
idx_ptrack[i]['path'],idx_ptrack[i]['new_size'])
182179
# get ptrack for every idx
183180
idx_ptrack[i]['ptrack']=self.get_ptrack_bits_per_page_for_fork(
184-
idx_ptrack[i]['path'],idx_ptrack[i]['new_size'])
181+
node,idx_ptrack[i]['path'],idx_ptrack[i]['new_size'])
185182

186183
# compare pages and check ptrack sanity
187184
self.check_ptrack_sanity(idx_ptrack[i])
188185

189186
self.clean_pb(node)
190187
node.stop()
191188

192-
@unittest.skip("123")
189+
#@unittest.skip("123")
193190
deftest_ptrack_cluster_gist(self):
194191
fname=self.id().split('.')[3]
195-
print'{0} started'.format(fname)
196192
node=self.make_simple_node(base_dir="tmp_dirs/ptrack/{0}".format(fname),
197193
set_replication=True,
198194
initdb_params=['--data-checksums','-A trust'],
@@ -240,18 +236,17 @@ def test_ptrack_cluster_gist(self):
240236
idx_ptrack[i]['path'],idx_ptrack[i]['new_size'])
241237
# get ptrack for every idx
242238
idx_ptrack[i]['ptrack']=self.get_ptrack_bits_per_page_for_fork(
243-
idx_ptrack[i]['path'],idx_ptrack[i]['new_size'])
239+
node,idx_ptrack[i]['path'],idx_ptrack[i]['new_size'])
244240

245241
# compare pages and check ptrack sanity
246242
self.check_ptrack_sanity(idx_ptrack[i])
247243

248244
self.clean_pb(node)
249245
node.stop()
250246

251-
@unittest.skip("123")
247+
#@unittest.skip("123")
252248
deftest_ptrack_cluster_gin(self):
253249
fname=self.id().split('.')[3]
254-
print'{0} started'.format(fname)
255250
node=self.make_simple_node(base_dir="tmp_dirs/ptrack/{0}".format(fname),
256251
set_replication=True,
257252
initdb_params=['--data-checksums','-A trust'],
@@ -299,7 +294,7 @@ def test_ptrack_cluster_gin(self):
299294
idx_ptrack[i]['path'],idx_ptrack[i]['new_size'])
300295
# get ptrack for every idx
301296
idx_ptrack[i]['ptrack']=self.get_ptrack_bits_per_page_for_fork(
302-
idx_ptrack[i]['path'],idx_ptrack[i]['new_size'])
297+
node,idx_ptrack[i]['path'],idx_ptrack[i]['new_size'])
303298

304299
# compare pages and check ptrack sanity
305300
self.check_ptrack_sanity(idx_ptrack[i])

0 commit comments

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