refactor s3compact code & workaround read failure when diskcachetype=2 #1006
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
|
recheck |
xu-chaojie
reviewed
Jan 21, 2022
xu-chaojie
reviewed
Jan 24, 2022
xu-chaojie
reviewed
Jan 24, 2022
xu-chaojie
reviewed
Jan 24, 2022
xu-chaojie
approved these changes
Jan 26, 2022
wu-hanqing
reviewed
Jan 27, 2022
curvefs/src/metaserver/s3compact.h
Outdated
| @@ -35,20 +35,20 @@ using curvefs::common::PartitionInfo; | |||
| // one S3Compact per partition | |||
| class S3Compact { | |||
| public: | |||
| explicit S3Compact(std::shared_ptr<InodeStorage> inodeStorage, | |||
| explicit S3Compact(std::shared_ptr<InodeManager> inodeManager, | |||
There was a problem hiding this comment.
explicit is duplicate, and make first parameter as const reference
| << inode->inodeid(); | ||
| auto checkWithLog = [&](bool cond) { | ||
| if (!cond) | ||
| LOG(ERROR) << "s3compact: bad GetOrModifyS3ChunkInfo request"; |
There was a problem hiding this comment.
is WARNING log enough for this case ?
| Inode* inode) { | ||
| VLOG(9) << "s3compact: request from s3compaction, inodeId:" | ||
| << inode->inodeid(); | ||
| auto checkWithLog = [&](bool cond) { |
There was a problem hiding this comment.
capture by reference is unnecessary.
| const auto& toRemoveS3chunks = toRemoveList.s3chunks(); | ||
| auto s3chunkIt = | ||
| std::find_if(toRemoveS3chunks.begin(), toRemoveS3chunks.end(), | ||
| [&](const S3ChunkInfo& toRemoveS3chunk) { |
There was a problem hiding this comment.
capture origS3chunk only, specific it
| *newList.add_s3chunks() = toAddList.s3chunks(0); | ||
| VLOG(9) << "s3compact: add chunkid " | ||
| << toAddList.s3chunks(0).chunkid(); | ||
| inserted = true; |
There was a problem hiding this comment.
if the compacted s3chunkinfo is inserted, does it means all behind s3chunkinfos in origList is newer ? if so, you can just add all newer s3chunkinfos into newList once.
There was a problem hiding this comment.
yes, add a fastpath for the left ones
2. with diskcache write cache enable, metadata may be newer than data in s3. so we will meet s3 read failure, add retry to workaround this situation. 3. change GetOrModifyS3ChunkInfo to keep order
|
recheck |
wu-hanqing
approved these changes
Jan 28, 2022
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.
newer than data in s3. so we will meet s3 read failure,
add retry to workaround this situation.