rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-06-01 04:20:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test. Add zenith.signal to fullbackup

Browse Source
This commit is contained in:
Anastasia Lubennikova
2022-06-17 20:23:13 +03:00
committed by Bojan Serafimov
parent 1a9b8d9255
commit 1b216cc76a
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pageserver/src/basebackup.rs
View File

@@ -322,24 +322,21 @@ impl<'a> Basebackup<'a> {
pg_control.checkPointCopy = checkpoint;
pg_control.state = pg_constants::DB_SHUTDOWNED;
// Postgres doesn't recognize the zenith.signal file and doesn't need it.
if !self.full_backup {
// add zenith.signal file
let mut zenith_signal = String::new();
if self.prev_record_lsn == Lsn(0) {
if self.lsn == self.timeline.get_ancestor_lsn() {
write!(zenith_signal, "PREV LSN: none")?;
} else {
write!(zenith_signal, "PREV LSN: invalid")?;
}
// add zenith.signal file
let mut zenith_signal = String::new();
if self.prev_record_lsn == Lsn(0) {
if self.lsn == self.timeline.get_ancestor_lsn() {
write!(zenith_signal, "PREV LSN: none")?;
} else {
write!(zenith_signal, "PREV LSN: {}", self.prev_record_lsn)?;
write!(zenith_signal, "PREV LSN: invalid")?;
}
self.ar.append(
&new_tar_header("zenith.signal", zenith_signal.len() as u64)?,
zenith_signal.as_bytes(),
)?;
} else {
write!(zenith_signal, "PREV LSN: {}", self.prev_record_lsn)?;
}
self.ar.append(
&new_tar_header("zenith.signal", zenith_signal.len() as u64)?,
zenith_signal.as_bytes(),
)?;
//send pg_control
let pg_control_bytes = pg_control.encode();

3
test_runner/batch_others/test_fullbackup.py
View File

@@ -69,5 +69,6 @@ def test_fullbackup(zenith_env_builder: ZenithEnvBuilder,
f"port={port}",
])
vanilla_pg.start()
num_rows_found = vanilla_pg.safe_psql('select count(*) from tbl;', user="cloud_admin")[0][0]
num_rows_found = vanilla_pg.safe_psql('select count(*) from tbl;',
username="zenith_admin")[0][0]
assert num_rows == num_rows_found