fix(journal): preserve archives when rolls share a timestamp - #521
Merged
singaraiona merged 1 commit intoSep 13, 2026
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
How it looks from the user's side
A service rolls its journal twice during the same UTC second.
Before - both rolls target the same
base.YYYY.MM.DDTHH.MM.SSZ.logpath, so the second roll replaces the first archive and its journal entries are lost.After - the first archive keeps the timestamped name and subsequent collisions use unique names such as
base.YYYY.MM.DDTHH.MM.SSZ.1.log, preserving every segment.Root cause
ray_journal_rollgenerated archive names with second-level precision and passed them torename(), which replaces an existing destination.Fix
Probe the timestamped archive path before closing the journal. If it already exists, append an incrementing numeric suffix until an unused path is found.
Tests
./rayforce.test --filter journal/roll_twicemake testwith the repository's non-ASAN debug flags