aljaz/turso
1
0
Fork 0
mirror of https://github.com/aljazceru/turso.git synced 2026-02-11 11:14:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix check in CheckpointState::Start for work after determining safe frame

Browse Source
This commit is contained in:
PThorpe92
2025-08-09 15:30:50 -04:00
parent 23f30a481a
commit 0ba52a489e
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
core/storage/wal.rs
View File

@@ -1375,7 +1375,9 @@ impl WalFile {
(max_frame, n_backfills)
};
let needs_backfill = max_frame > nbackfills;
if !needs_backfill && matches!(mode, CheckpointMode::Passive) {
if !needs_backfill
&& matches!(mode, CheckpointMode::Passive | CheckpointMode::Full)
{
// there are no frames to copy over and we don't need to reset
// the log so we can return early success.
return Ok(IOResult::Done(self.prev_checkpoint.clone()));
@@ -1387,15 +1389,13 @@ impl WalFile {
Err(_) => return Err(LimboError::Busy),
Ok(res) => res,
};
self.ongoing_checkpoint.state = if matches!(mode, CheckpointMode::Full)
&& !self.ongoing_checkpoint.has_work()
{
CheckpointState::Done
} else {
CheckpointState::ReadFrame
};
self.ongoing_checkpoint.min_frame = nbackfills + 1;
self.ongoing_checkpoint.current_page = 0;
self.ongoing_checkpoint.state = if self.ongoing_checkpoint.has_work() {
CheckpointState::ReadFrame
} else {
CheckpointState::Done
};
tracing::trace!(
"checkpoint_start(min_frame={}, max_frame={})",
self.ongoing_checkpoint.min_frame,
@@ -2863,7 +2863,7 @@ pub mod test {
let mx_before = unsafe { (&*wal_shared.get()).max_frame.load(Ordering::SeqCst) };
assert!(mx_before > 0, "expected frames in WAL before FULL");
// Run FULL checkpoint — must backfill *all* frames up to mx_before
// Run FULL checkpoint - must backfill *all* frames up to mx_before
let result = {
let pager = conn.pager.borrow();
let mut wal = pager.wal.as_ref().unwrap().borrow_mut();
@@ -2872,11 +2872,6 @@ pub mod test {
assert_eq!(result.num_wal_frames, mx_before);
assert_eq!(result.num_checkpointed_frames, mx_before);
// If your caller does truncation/sync after a full backfill, it may keep a guard.
// It's fine to release here to avoid holding locks past the test.
let mut result = result;
result.release_guard();
}
#[test]