Skip to content

[PGPRO-5387] Vanilla fixed idle replica archiving #458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 19 additions & 21 deletions tests/backup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'])
Expand Down
15 changes: 2 additions & 13 deletions tests/replica.py
Original file line number Diff line number Diff line change
Expand Up @@ -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=[
Expand All @@ -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'])
Expand All @@ -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'])

Expand Down