rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2026-01-14 08:52:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Store atomic last_valid_lsn after seqwait_lsn.advance

Browse Source
This commit is contained in:
Konstantin Knizhnik
2021-04-25 14:11:31 +03:00
parent 1cb9b5523b
commit da9bf5dc63
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pageserver/src/page_cache.rs
View File

@@ -686,9 +686,8 @@ impl PageCache {
let oldlsn = shared.last_valid_lsn; let oldlsn = shared.last_valid_lsn;
if lsn >= oldlsn { if lsn >= oldlsn {
shared.last_valid_lsn = lsn; shared.last_valid_lsn = lsn;
self.seqwait_lsn.advance(lsn);
self.last_valid_lsn.store(lsn, Ordering::Relaxed); self.last_valid_lsn.store(lsn, Ordering::Relaxed);
self.seqwait_lsn.advance(lsn);
} else { } else {
warn!( warn!(
"attempted to move last valid LSN backwards (was {:X}/{:X}, new {:X}/{:X})", "attempted to move last valid LSN backwards (was {:X}/{:X}, new {:X}/{:X})",
@@ -714,10 +713,9 @@ impl PageCache {
shared.last_valid_lsn = lsn; shared.last_valid_lsn = lsn;
shared.last_record_lsn = lsn; shared.last_record_lsn = lsn;
self.seqwait_lsn.advance(lsn);
self.last_valid_lsn.store(lsn, Ordering::Relaxed); self.last_valid_lsn.store(lsn, Ordering::Relaxed);
self.last_record_lsn.store(lsn, Ordering::Relaxed); self.last_record_lsn.store(lsn, Ordering::Relaxed);
self.seqwait_lsn.advance(lsn);
} }
/// ///
@@ -784,7 +782,7 @@ impl PageCache {
// The caller must ensure that WAL has been received up to 'lsn'. // The caller must ensure that WAL has been received up to 'lsn'.
// //
fn relsize_get_nowait(&self, rel: &RelTag, lsn: u64) -> anyhow::Result<u32> { fn relsize_get_nowait(&self, rel: &RelTag, lsn: u64) -> anyhow::Result<u32> {
//assert!(lsn <= self.last_valid_lsn.load(Ordering::Acquire)); assert!(lsn <= self.last_valid_lsn.load(Ordering::Acquire));
let mut key = CacheKey { let mut key = CacheKey {
tag: BufferTag { tag: BufferTag {