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

Commit0c02283

Browse files
author
vshepard
committed
[NOJIRA] remove distutils
1 parentac92457 commit0c02283

File tree

5 files changed

+17
-37
lines changed

5 files changed

+17
-37
lines changed

‎tests/archive_test.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
importsubprocess
99
fromsysimportexit
1010
fromtimeimportsleep
11-
fromdistutils.dir_utilimportcopy_tree
1211

1312

1413
classArchiveTest(ProbackupTest,unittest.TestCase):
@@ -1243,10 +1242,6 @@ def test_archive_catalog(self):
12431242
self.add_instance(backup_dir,'replica',replica)
12441243
self.set_archiving(backup_dir,'replica',replica,replica=True)
12451244

1246-
copy_tree(
1247-
os.path.join(backup_dir,'wal','master'),
1248-
os.path.join(backup_dir,'wal','replica'))
1249-
12501245
replica.slow_start(replica=True)
12511246

12521247
# FULL backup replica

‎tests/backup_test.py‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
fromtimeimportsleep,time
55
from .helpers.ptrack_helpersimportbase36enc,ProbackupTest,ProbackupException
66
importshutil
7-
fromdistutils.dir_utilimportcopy_tree
87
fromtestgresimportProcessType,QueryException
98
importsubprocess
109

@@ -2330,14 +2329,13 @@ def test_backup_with_less_privileges_role(self):
23302329
# bgwriter_pid = node.auxiliary_pids[ProcessType.BackgroundWriter][0]
23312330
# gdb_checkpointer = self.gdb_attach(bgwriter_pid)
23322331

2333-
copy_tree(
2334-
os.path.join(backup_dir,'wal','node'),
2335-
os.path.join(backup_dir,'wal','replica'))
2336-
23372332
replica.slow_start(replica=True)
23382333

2339-
# self.switch_wal_segment(node)
2340-
# self.switch_wal_segment(node)
2334+
# make sure replica will archive wal segment with backup start point
2335+
lsn=self.switch_wal_segment(node,and_tx=True)
2336+
replica.poll_query_until(f"select pg_last_wal_replay_lsn() >= '{lsn}'")
2337+
replica.execute('CHECKPOINT')
2338+
replica.poll_query_until(f"select redo_lsn >= '{lsn}' from pg_control_checkpoint()")
23412339

23422340
self.backup_node(
23432341
backup_dir,'replica',replica,

‎tests/helpers/ptrack_helpers.py‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1701,29 +1701,26 @@ def version_to_num(self, version):
17011701
num=num*100+int(re.sub(r"[^\d]","",part))
17021702
returnnum
17031703

1704-
defswitch_wal_segment(self,node):
1704+
defswitch_wal_segment(self,node,sleep_seconds=1,and_tx=False):
17051705
"""
1706-
Execute pg_switch_wal/xlog() in given node
1706+
Execute pg_switch_wal() in given node
17071707
17081708
Args:
17091709
node: an instance of PostgresNode or NodeConnection class
17101710
"""
17111711
ifisinstance(node,testgres.PostgresNode):
1712-
ifself.version_to_num(
1713-
node.safe_psql('postgres','show server_version').decode('utf-8')
1714-
)>=self.version_to_num('10.0'):
1715-
node.safe_psql('postgres','select pg_switch_wal()')
1716-
else:
1717-
node.safe_psql('postgres','select pg_switch_xlog()')
1712+
withnode.connect('postgres')ascon:
1713+
ifand_tx:
1714+
con.execute('select txid_current()')
1715+
con.execute('select pg_switch_wal()')
1716+
lsn=con.execute('select pg_switch_wal()')[0][0]
17181717
else:
1719-
ifself.version_to_num(
1720-
node.execute('show server_version')[0][0]
1721-
)>=self.version_to_num('10.0'):
1722-
node.execute('select pg_switch_wal()')
1723-
else:
1724-
node.execute('select pg_switch_xlog()')
1718+
node.execute('select pg_switch_wal()')
1719+
lsn=node.execute('select pg_switch_wal()')[0][0]
17251720

1726-
sleep(1)
1721+
ifsleep_seconds>0:
1722+
sleep(sleep_seconds)
1723+
returnlsn
17271724

17281725
defwait_until_replica_catch_with_master(self,master,replica):
17291726

‎tests/replica_test.py‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
fromdatetimeimportdatetime,timedelta
55
importsubprocess
66
importtime
7-
fromdistutils.dir_utilimportcopy_tree
87
fromtestgresimportProcessType
98
fromtimeimportsleep
109

@@ -718,10 +717,6 @@ def test_replica_stop_lsn_null_offset_next_record(self):
718717
self.set_replica(master,replica,synchronous=True)
719718
self.set_archiving(backup_dir,'replica',replica,replica=True)
720719

721-
copy_tree(
722-
os.path.join(backup_dir,'wal','master'),
723-
os.path.join(backup_dir,'wal','replica'))
724-
725720
replica.slow_start(replica=True)
726721

727722
self.switch_wal_segment(master)
@@ -980,10 +975,6 @@ def test_replica_toast(self):
980975
self.set_replica(master,replica,synchronous=True)
981976
self.set_archiving(backup_dir,'replica',replica,replica=True)
982977

983-
copy_tree(
984-
os.path.join(backup_dir,'wal','master'),
985-
os.path.join(backup_dir,'wal','replica'))
986-
987978
replica.slow_start(replica=True)
988979

989980
self.switch_wal_segment(master)

‎tests/retention_test.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
fromdatetimeimportdatetime,timedelta
44
from .helpers.ptrack_helpersimportProbackupTest,ProbackupException
55
fromtimeimportsleep
6-
fromdistutils.dir_utilimportcopy_tree
76

87

98
classRetentionTest(ProbackupTest,unittest.TestCase):

0 commit comments

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