Fix wraparound in SstFileManager #13010
Closed
Conversation
This file contains 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
|
This pull request was exported from Phabricator. Differential Revision: D62535775 |
anand1976
approved these changes
Sep 13, 2024
| @@ -450,7 +451,6 @@ void SstFileManagerImpl::OnAddFileImpl(const std::string& file_path, | |||
| // File was added before, we will just update the size | |||
| total_files_size_ -= tracked_file->second; | |||
| total_files_size_ += file_size; | |||
| cur_compactions_reserved_size_ -= file_size; | |||
There was a problem hiding this comment.
Removing this seems appropriate to me. I can't think of any reason why we'd want to decrement cur_compactions_reserved_size_ here. We would come down this path only in a non-compaction case.
There was a problem hiding this comment.
Thank you for spending time to help check this!
Summary: Pull Request resolved: facebook#13010 The OnAddFile cur_compactions_reserved_size_ accounting causes wraparound when re-opening a database with an unowned SstFileManager and during recovery. It was introduced in facebook#4164 which addresses out of space recovery with an unclear purpose. Compaction jobs do this accounting via EnoughRoomForCompaction/OnCompactionCompletion and to my understanding would never reuse a sst file name. Reviewed By: anand1976 Differential Revision: D62535775
|
This pull request was exported from Phabricator. Differential Revision: D62535775 |
jowlyzhang
force-pushed
the
export-D62535775
branch
from
11cb7a8 to
8ead297
Compare
|
This pull request has been merged in 40adb2b. |
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: The OnAddFile cur_compactions_reserved_size_ accounting causes wraparound when re-opening a database with an unowned SstFileManager and during recovery. It was introduced in #4164 which addresses out of space recovery with an unclear purpose. Compaction jobs do this accounting via EnoughRoomForCompaction/OnCompactionCompletion and to my understanding would never reuse a sst file name.
Differential Revision: D62535775