KAFKA-6292: Improved FileLogInputStream batch position checks in order to avoid type overflow related errors#4928
Merged
hachikuji merged 7 commits intoapache:trunkfrom May 9, 2018
SuppieRK:rkhlebnov
Merged
KAFKA-6292: Improved FileLogInputStream batch position checks in order to avoid type overflow related errors#4928hachikuji merged 7 commits intoapache:trunkfrom SuppieRK:rkhlebnov
hachikuji merged 7 commits intoapache:trunkfrom
SuppieRK:rkhlebnov
Conversation
…ng unnecessary type conversion.
Member
|
Thanks for the PR. Since this is fixing a bug, it would be great to add some unit tests. |
Contributor
Author
|
@ijuma I added simple Unit test to cover this corner case, although it seems to me as a good idea to update documentation or add explicit checks for the |
hachikuji
reviewed
Apr 27, 2018
Contributor
hachikuji
left a comment
hachikuji
left a comment
There was a problem hiding this comment.
Thanks for the fix! Left a couple minor comments.
| } | ||
|
|
||
| @Test | ||
| public void testNextBatchSelectionAtMaxIntValue() throws IOException { |
Contributor
There was a problem hiding this comment.
Maybe worth a test case which ensures correct behavior with start and end = 0 as well? Another good one would be to have a single batch which is truncated in the middle.
Contributor
Author
There was a problem hiding this comment.
This would be a good idea, but if the case includes position equal to size we will always get null. The case I covered was about type overflow when both parameters were set to their maximum values, so I think about renaming this method instead.
|
|
||
| @Test | ||
| public void testNextBatchSelectionAtMaxIntValue() throws IOException { | ||
| if (magic == 0 && compression == CompressionType.NONE) { |
Contributor
There was a problem hiding this comment.
Seems no harm running this test case for every parameterization. I know it's redundant since we are not using either of the fields, but it feels less arbitrary.
Contributor
Author
|
@hachikuji can you check my additions, please? |
hachikuji
approved these changes
May 8, 2018
Contributor
hachikuji
left a comment
hachikuji
left a comment
There was a problem hiding this comment.
LGTM. Thanks for the patch!
ying-zheng
pushed a commit
to ying-zheng/kafka
that referenced
this pull request
Jul 6, 2018
… type overflow (apache#4928) Switch from sum operations to subtraction to avoid type casting in checks and type overflow during `FlieLogInputStream` work, especially in cases where property `log.segment.bytes` was set close to the `Integer.MAX_VALUE` and used as a `position` inside `nextBatch()` function. Reviewers: Ismael Juma <ismael@juma.me.uk>, Jason Gustafson <jason@confluent.io>
hachikuji
pushed a commit
that referenced
this pull request
Jul 6, 2018
… type overflow (#4928) Switch from sum operations to subtraction to avoid type casting in checks and type overflow during `FlieLogInputStream` work, especially in cases where property `log.segment.bytes` was set close to the `Integer.MAX_VALUE` and used as a `position` inside `nextBatch()` function. Reviewers: Ismael Juma <ismael@juma.me.uk>, Jason Gustafson <jason@confluent.io>
hachikuji
pushed a commit
that referenced
this pull request
Jul 6, 2018
… type overflow (#4928) Switch from sum operations to subtraction to avoid type casting in checks and type overflow during `FlieLogInputStream` work, especially in cases where property `log.segment.bytes` was set close to the `Integer.MAX_VALUE` and used as a `position` inside `nextBatch()` function. Reviewers: Ismael Juma <ismael@juma.me.uk>, Jason Gustafson <jason@confluent.io>
allenxwang
pushed a commit
to allenxwang/kafka
that referenced
this pull request
Aug 24, 2018
…:1.1.1-sync to 1.1-nflx * commit '9611672e287c1a7933a78590e3f381da2ae7d136': (57 commits) MINOR: increase dev version from 1.1.1-SNAPSHOT to 1.1.2-SNAPSHOT (apache#5409) MINOR: Add thread dumps if broker node cannot be stopped (apache#5373) MINOR: update release.py MINOR: fix upgrade docs for Streams (apache#5392) MINOR: improve docs version numbers (apache#5372) Update version on the branch to 1.1.2-SNAPSHOT KAFKA-6292; Improve FileLogInputStream batch position checks to avoid type overflow (apache#4928) HOTFIX: Fix checkstyle errors in MetricsTest (apache#5345) KAFKA-7136: Avoid deadlocks in synchronized metrics reporters (apache#5341) MINOR: Close timing window in SimpleAclAuthorizer startup (apache#5318) MINOR: Use kill_java_processes when killing ConsoleConsumer in system tests (apache#5297) KAFKA-7104: More consistent leader's state in fetch response (apache#5305) Revert "MINOR: Avoid coarse lock in Pool#getAndMaybePut (apache#5258)" MINOR: Avoid coarse lock in Pool#getAndMaybePut (apache#5258) MINOR: bugfix streams total metrics (apache#5277) KAFKA-7082: Concurrent create topics may throw NodeExistsException (apache#5259) MINOR: Upgrade to Gradle 4.8.1 KAFKA-7012: Don't process SSL channels without data to process (apache#5237) KAFKA-7058: Comparing schema default values using Objects#deepEquals() KAFKA-7047: Added SimpleHeaderConverter to plugin isolation whitelist ...
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
3 participants
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.
Basically, my change was very simple - switch from sum operations to subtraction to avoid type casting in checks and type overflow during FlieLogInputStream work, especially in cases where property
log.segment.byteswas set close to theInteger.MAX_VALUEand used as apositioninsidenextBatch()function.All related Unit tests are working as intended. No new tests (probably) required.