Skip to content

KAFKA-7693: Fix SequenceNumber overflow in client TransactionManager. #5989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hachikuji merged 7 commits into from
Jan 25, 2019
Merged

KAFKA-7693: Fix SequenceNumber overflow in client TransactionManager. #5989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
88a3361
KAFKA-7693: Fix SequenceNumber overflow in client TransactionManager.
Dec 3, 2018
1334ae5
Add unittest for client transactionManager test.
Jan 11, 2019
df71d4d
Move into one test function.
Jan 14, 2019
1966a40
Merge branch 'trunk' into 1202clientsequnceid
Jan 14, 2019
bd1363c
Merge branch 'trunk' into 1202clientsequnceid
Jan 15, 2019
659350c
Add a separate unitest.
Jan 15, 2019
10c3b6b
Merge branch 'trunk' into 1202clientsequnceid
Jan 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion clients/src/main/java/org/apache/kafka/clients/producer/internals/TransactionManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import org.apache.kafka.common.errors.GroupAuthorizationException;
import org.apache.kafka.common.errors.TopicAuthorizationException;
import org.apache.kafka.common.protocol.Errors;
import org.apache.kafka.common.record.DefaultRecordBatch;
import org.apache.kafka.common.record.RecordBatch;
import org.apache.kafka.common.requests.AbstractRequest;
import org.apache.kafka.common.requests.AbstractResponse;
Expand Down Expand Up @@ -419,7 +420,7 @@ synchronized void incrementSequenceNumber(TopicPartition topicPartition, int inc
if (currentSequenceNumber == null)
throw new IllegalStateException("Attempt to increment sequence number for a partition with no current sequence.");

currentSequenceNumber += increment;
currentSequenceNumber = DefaultRecordBatch.incrementSequence(currentSequenceNumber, increment);
nextSequence.put(topicPartition, currentSequenceNumber);
}

Expand Down
2 changes: 1 addition & 1 deletion clients/src/main/java/org/apache/kafka/common/record/DefaultRecordBatch.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ static int estimateBatchSizeUpperBound(ByteBuffer key, ByteBuffer value, Header[
return RECORD_BATCH_OVERHEAD + DefaultRecord.recordSizeUpperBound(key, value, headers);
}

static int incrementSequence(int baseSequence, int increment) {
public static int incrementSequence(int baseSequence, int increment) {
if (baseSequence > Integer.MAX_VALUE - increment)
return increment - (Integer.MAX_VALUE - baseSequence) - 1;
return baseSequence + increment;
Expand Down
12 changes: 12 additions & 0 deletions ...nts/src/test/java/org/apache/kafka/clients/producer/internals/TransactionManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,18 @@ public void testDefaultSequenceNumber() {
assertEquals((int) transactionManager.sequenceNumber(tp0), 3);
}

@Test
public void testSequenceNumberOverflow() {
TransactionManager transactionManager = new TransactionManager();
assertEquals((int) transactionManager.sequenceNumber(tp0), 0);
transactionManager.incrementSequenceNumber(tp0, Integer.MAX_VALUE);
assertEquals((int) transactionManager.sequenceNumber(tp0), Integer.MAX_VALUE);
transactionManager.incrementSequenceNumber(tp0, 100);
assertEquals((int) transactionManager.sequenceNumber(tp0), 99);
transactionManager.incrementSequenceNumber(tp0, Integer.MAX_VALUE);
assertEquals((int) transactionManager.sequenceNumber(tp0), 98);
}

@Test
public void testProducerIdReset() {
TransactionManager transactionManager = new TransactionManager();
Expand Down