fix(Foundation): Fix FileChannel purge race with compression#5116
Merged
fix(Foundation): Fix FileChannel purge race with compression#5116
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.
Summary
Fixes #4848 (and completes the fix for #2439).
The previous fix (commit 9aec797) synchronized log rotation with compression by waiting for previous compressions to complete. However,
purge()was still called immediately afterarchive()returned, while the new compression was still running in the background. This race condition could cause incorrect file counts during purging.Changes
ArchiveStrategy.h:
PurgeCallbacktype andsetPurgeCallback()methodArchiveByTimestampStrategy::archive()- added missing_rotateMutexlock and compression wait (was completely unsynchronized)ArchiveStrategy.cpp:
compressFile())archive()if no compression was startedFileChannel.cpp:
purge()calls fromlog()andopen()- now handled via callbackFileChannelTest.cpp:
testCompressedRotationexpectations: withpurgeCount=5, expect 5 archives (was incorrectly expecting 6 due to the race condition)How it works
_rotateMutex)archive()(under_rotateMutex)Test plan
FileChannelTestpasses (12 tests includingtestCompressedRotation)testPurgeCountpasses