fix(atomix): consume read buffer correctly #4372
Merged
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
Fix issue where the read buffer was consumed only half and the rest was thrown away. Refactor FileChannelJournalSegmentReader#readNext to improve readability and hopefully maintainability.
deepthidevaki
requested changes
Apr 27, 2020
There was a problem hiding this comment.
I didn't quite understand what was the problem in the previous version. But now the code is more readable , so 👍 🙂
Can we add more tests for this in FileChannelSegmentReaderTest? I could find the problem with reading checksum length by tweaking the existing test to read all events, write entries of type Long and set max entry size to 2*Long. I think that we have to test it with different configuration - entry size, max entry size etc. to find potential bugs here.
atomix/storage/src/main/java/io/atomix/storage/journal/FileChannelJournalSegmentReader.java
Outdated
Show resolved
Hide resolved
Adjust check such that it takes also checksum into account. Adjust tests such that they fail if this change is missing
|
Thanks @deepthidevaki for the review. I adjusted my PR and take the checksum length into account. I also changed to current tests such that they are failing if this check is missing. Furthermore I added one more test. |
deepthidevaki
approved these changes
Apr 29, 2020
atomix/storage/src/test/java/io/atomix/storage/journal/AbstractJournalTest.java
Show resolved
Hide resolved
|
bors r+ |
zeebe-bors bot
added a commit
that referenced
this pull request
Apr 29, 2020
4372: fix(atomix): consume read buffer correctly r=Zelldon a=Zelldon ## Description Fix issue where the read buffer was consumed only half and the rest was thrown away. Refactor `FileChannelJournalSegmentReader#readNext` to improve readability and hopefully maintainability. <!-- Please explain the changes you made here. --> I run also a benchmark with these changes (#4358 was also part of the branch I run a benchmark with)  ## Related issues <!-- Which issues are closed by this PR or are related --> closes #4248 # Co-authored-by: Christopher Zell <zelldon91@googlemail.com>
Build failed |
|
Bors r+ |
Build succeeded |
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.
Description
Fix issue where the read buffer was consumed only half and the rest was
thrown away.
Refactor
FileChannelJournalSegmentReader#readNextto improve readability and hopefully maintainability.I run also a benchmark with these changes (#4358 was also part of the branch I run a benchmark with)
Related issues
closes #4248
Pull Request Checklist
mvn clean install -DskipTestslocally before committing