You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kafka.apache.org by mi...@apache.org on 2024/10/15 08:13:34 UTC
(kafka) branch trunk updated: MINOR: Cleanups in SharePartitionTest (#17464)
This is an automated email from the ASF dual-hosted git repository.
mimaison pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/kafka.git
The following commit(s) were added to refs/heads/trunk by this push:
new 491395e0b0e MINOR: Cleanups in SharePartitionTest (#17464)
491395e0b0e is described below
commit 491395e0b0efa7a3eee88fde1f8c539bb1f882d4
Author: kwonyonghyun <10...@users.noreply.github.com>
AuthorDate: Tue Oct 15 17:13:27 2024 +0900
MINOR: Cleanups in SharePartitionTest (#17464)
Reviewers: Mickael Maison <mi...@gmail.com>, Andrew Schofield <an...@live.com>, Ken Huang <s7...@gmail.com>
---
.../kafka/server/share/SharePartitionTest.java | 185 +++++++++++----------
1 file changed, 93 insertions(+), 92 deletions(-)
diff --git a/core/src/test/java/kafka/server/share/SharePartitionTest.java b/core/src/test/java/kafka/server/share/SharePartitionTest.java
index d2b84accbbd..3ebb6bdb4e8 100644
--- a/core/src/test/java/kafka/server/share/SharePartitionTest.java
+++ b/core/src/test/java/kafka/server/share/SharePartitionTest.java
@@ -87,10 +87,11 @@ import static org.mockito.ArgumentMatchers.anyList;
public class SharePartitionTest {
+ private static final String ACQUISITION_LOCK_NEVER_GOT_RELEASED = "Acquisition lock never got released.";
private static final String GROUP_ID = "test-group";
- private static final String MEMBER_ID = "member-1";
private static final int MAX_DELIVERY_COUNT = 5;
private static final TopicIdPartition TOPIC_ID_PARTITION = new TopicIdPartition(Uuid.randomUuid(), 0, "test-topic");
+ private static final String MEMBER_ID = "member-1";
private static Timer mockTimer;
private static final Time MOCK_TIME = new MockTime();
private static final short MAX_IN_FLIGHT_MESSAGES = 200;
@@ -1359,7 +1360,7 @@ public class SharePartitionTest {
sharePartition.cachedState().get(0L).batchAcquisitionLockTimeoutTask() == null &&
sharePartition.timer().size() == 0,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
}
@Test
@@ -1380,7 +1381,7 @@ public class SharePartitionTest {
&& sharePartition.cachedState().get(10L).batchDeliveryCount() == 1
&& sharePartition.cachedState().get(10L).batchAcquisitionLockTimeoutTask() == null,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
}
@Test
@@ -1412,7 +1413,7 @@ public class SharePartitionTest {
sharePartition.cachedState().get(0L).batchAcquisitionLockTimeoutTask() == null &&
sharePartition.cachedState().get(5L).batchAcquisitionLockTimeoutTask() == null,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
}
@Test
@@ -1432,7 +1433,7 @@ public class SharePartitionTest {
sharePartition.nextFetchOffset() == 10 &&
sharePartition.cachedState().get(10L).batchState() == RecordState.AVAILABLE,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
// Acquire the same batch again.
sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 3, memoryRecords(5, 10),
@@ -1475,7 +1476,7 @@ public class SharePartitionTest {
sharePartition.cachedState().get(0L).batchDeliveryCount() == 1 &&
sharePartition.cachedState().get(0L).batchAcquisitionLockTimeoutTask() == null,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
}
@Test
@@ -1506,7 +1507,7 @@ public class SharePartitionTest {
sharePartition.cachedState().get(5L).batchDeliveryCount() == 1 &&
sharePartition.cachedState().get(5L).batchAcquisitionLockTimeoutTask() == null,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
}
@Test
@@ -1556,7 +1557,7 @@ public class SharePartitionTest {
sharePartition.cachedState().get(5L).batchAcquisitionLockTimeoutTask() == null &&
sharePartition.cachedState().get(10L).batchAcquisitionLockTimeoutTask() == null,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
assertEquals(RecordState.AVAILABLE, sharePartition.cachedState().get(1L).batchState());
assertEquals(RecordState.ACKNOWLEDGED, sharePartition.cachedState().get(5L).batchState());
@@ -1582,7 +1583,7 @@ public class SharePartitionTest {
sharePartition.cachedState().get(10L).batchState() == RecordState.AVAILABLE &&
sharePartition.cachedState().get(10L).batchAcquisitionLockTimeoutTask() == null,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
// Acquire subset of records again.
sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 3, memoryRecords(3, 12),
@@ -1618,7 +1619,7 @@ public class SharePartitionTest {
expectedOffsetStateMap.equals(sharePartition.cachedState().get(10L).offsetState());
},
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
assertNull(sharePartition.cachedState().get(10L).offsetState().get(10L).acquisitionLockTimeoutTask());
assertNull(sharePartition.cachedState().get(10L).offsetState().get(11L).acquisitionLockTimeoutTask());
assertNull(sharePartition.cachedState().get(10L).offsetState().get(12L).acquisitionLockTimeoutTask());
@@ -1708,7 +1709,7 @@ public class SharePartitionTest {
expectedOffsetStateMap2.equals(sharePartition.cachedState().get(10L).offsetState());
},
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
assertNull(sharePartition.cachedState().get(5L).offsetState().get(5L).acquisitionLockTimeoutTask());
assertNull(sharePartition.cachedState().get(5L).offsetState().get(6L).acquisitionLockTimeoutTask());
@@ -1755,7 +1756,7 @@ public class SharePartitionTest {
sharePartition.cachedState().get(10L).batchDeliveryCount() == 1 &&
sharePartition.cachedState().get(10L).batchAcquisitionLockTimeoutTask() == null,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 3, 0, memoryRecords(10, 10),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
@@ -1775,7 +1776,7 @@ public class SharePartitionTest {
sharePartition.cachedState().get(10L).batchDeliveryCount() == 2 &&
sharePartition.cachedState().get(10L).batchAcquisitionLockTimeoutTask() == null,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
}
@Test
@@ -1800,7 +1801,7 @@ public class SharePartitionTest {
sharePartition.cachedState().get(0L).batchDeliveryCount() == 1 &&
sharePartition.cachedState().get(0L).batchAcquisitionLockTimeoutTask() == null,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 3, 0, memoryRecords(5, 0),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
@@ -1836,7 +1837,7 @@ public class SharePartitionTest {
expectedOffsetStateMap.equals(sharePartition.cachedState().get(0L).offsetState());
},
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
assertNull(sharePartition.cachedState().get(0L).offsetState().get(0L).acquisitionLockTimeoutTask());
assertNull(sharePartition.cachedState().get(0L).offsetState().get(1L).acquisitionLockTimeoutTask());
@@ -1875,7 +1876,7 @@ public class SharePartitionTest {
sharePartition.cachedState().get(0L).batchState() == RecordState.AVAILABLE &&
sharePartition.cachedState().get(0L).batchAcquisitionLockTimeoutTask() == null,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 3, 0, memoryRecords(10, 0),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
@@ -1892,7 +1893,7 @@ public class SharePartitionTest {
sharePartition.cachedState().isEmpty() &&
sharePartition.nextFetchOffset() == 10,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
}
@Test
@@ -1913,7 +1914,7 @@ public class SharePartitionTest {
sharePartition.cachedState().get(5L).batchState() == RecordState.AVAILABLE &&
sharePartition.cachedState().get(5L).batchAcquisitionLockTimeoutTask() == null,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
// Acknowledge with ACCEPT type should throw InvalidRecordStateException since they've been released due to acquisition lock timeout.
CompletableFuture<Void> ackResult = sharePartition.acknowledge(MEMBER_ID,
@@ -1978,7 +1979,7 @@ public class SharePartitionTest {
expectedOffsetStateMap.equals(sharePartition.cachedState().get(5L).offsetState());
},
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
assertNull(sharePartition.cachedState().get(5L).offsetState().get(5L).acquisitionLockTimeoutTask());
assertNull(sharePartition.cachedState().get(5L).offsetState().get(6L).acquisitionLockTimeoutTask());
@@ -2016,7 +2017,7 @@ public class SharePartitionTest {
sharePartition.cachedState().get(5L).batchState() == RecordState.AVAILABLE &&
sharePartition.cachedState().get(5L).batchAcquisitionLockTimeoutTask() == null,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
}
@Test
@@ -2062,7 +2063,7 @@ public class SharePartitionTest {
expectedOffsetStateMap.equals(sharePartition.cachedState().get(5L).offsetState());
},
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
assertNull(sharePartition.cachedState().get(5L).offsetState().get(5L).acquisitionLockTimeoutTask());
assertNull(sharePartition.cachedState().get(5L).offsetState().get(6L).acquisitionLockTimeoutTask());
@@ -2547,12 +2548,12 @@ public class SharePartitionTest {
public void testReleaseAcquiredRecordsSubsetWithAnotherMember() {
SharePartition sharePartition = SharePartitionBuilder.builder().build();
- sharePartition.acquire("member-1",
+ sharePartition.acquire(MEMBER_ID,
new FetchPartitionData(Errors.NONE, 30, 0, memoryRecords(7, 5),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
- sharePartition.acknowledge("member-1",
+ sharePartition.acknowledge(MEMBER_ID,
Collections.singletonList(new ShareAcknowledgementBatch(5, 7, Collections.singletonList((byte) 1))));
// Release acquired records subset with another member.
@@ -2564,10 +2565,10 @@ public class SharePartitionTest {
expectedOffsetStateMap.put(5L, new InFlightState(RecordState.ACKNOWLEDGED, (short) 1, EMPTY_MEMBER_ID));
expectedOffsetStateMap.put(6L, new InFlightState(RecordState.ACKNOWLEDGED, (short) 1, EMPTY_MEMBER_ID));
expectedOffsetStateMap.put(7L, new InFlightState(RecordState.ACKNOWLEDGED, (short) 1, EMPTY_MEMBER_ID));
- expectedOffsetStateMap.put(8L, new InFlightState(RecordState.ACQUIRED, (short) 1, "member-1"));
- expectedOffsetStateMap.put(9L, new InFlightState(RecordState.ACQUIRED, (short) 1, "member-1"));
- expectedOffsetStateMap.put(10L, new InFlightState(RecordState.ACQUIRED, (short) 1, "member-1"));
- expectedOffsetStateMap.put(11L, new InFlightState(RecordState.ACQUIRED, (short) 1, "member-1"));
+ expectedOffsetStateMap.put(8L, new InFlightState(RecordState.ACQUIRED, (short) 1, MEMBER_ID));
+ expectedOffsetStateMap.put(9L, new InFlightState(RecordState.ACQUIRED, (short) 1, MEMBER_ID));
+ expectedOffsetStateMap.put(10L, new InFlightState(RecordState.ACQUIRED, (short) 1, MEMBER_ID));
+ expectedOffsetStateMap.put(11L, new InFlightState(RecordState.ACQUIRED, (short) 1, MEMBER_ID));
assertEquals(expectedOffsetStateMap, sharePartition.cachedState().get(5L).offsetState());
}
@@ -3527,7 +3528,7 @@ public class SharePartitionTest {
sharePartition.cachedState().get(35L).offsetState().equals(expectedOffsetStateMap3);
},
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
assertEquals(EMPTY_MEMBER_ID, sharePartition.cachedState().get(10L).batchMemberId());
assertEquals(RecordState.ARCHIVED, sharePartition.cachedState().get(10L).batchState());
@@ -3563,7 +3564,7 @@ public class SharePartitionTest {
sharePartition.cachedState().get(10L).batchMemberId().equals(EMPTY_MEMBER_ID) &&
sharePartition.cachedState().get(10L).batchState() == RecordState.AVAILABLE,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
}
@Test
@@ -3600,7 +3601,7 @@ public class SharePartitionTest {
sharePartition.cachedState().get(5L).batchState() == RecordState.ARCHIVED;
},
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
}
@Test
@@ -3795,7 +3796,7 @@ public class SharePartitionTest {
() -> sharePartition.nextFetchOffset() == 7 && sharePartition.cachedState().isEmpty() &&
sharePartition.startOffset() == 7 && sharePartition.endOffset() == 7,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(5, 10),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
@@ -3845,7 +3846,7 @@ public class SharePartitionTest {
() -> sharePartition.nextFetchOffset() == 3 && sharePartition.cachedState().isEmpty() &&
sharePartition.startOffset() == 3 && sharePartition.endOffset() == 3,
DEFAULT_MAX_WAIT_ACQUISITION_LOCK_TIMEOUT_MS,
- () -> "Acquisition lock never got released.");
+ () -> ACQUISITION_LOCK_NEVER_GOT_RELEASED);
sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(2, 3),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
@@ -4096,13 +4097,13 @@ public class SharePartitionTest {
public void testMaybeUpdateCachedStateWhenAcknowledgementTypeAccept() {
SharePartition sharePartition = SharePartitionBuilder.builder().build();
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(250, 0),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(250, 0),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertFalse(sharePartition.canAcquireRecords());
- sharePartition.acknowledge("member-1", Collections.singletonList(
+ sharePartition.acknowledge(MEMBER_ID, Collections.singletonList(
new ShareAcknowledgementBatch(0, 249, Collections.singletonList((byte) 1))));
assertEquals(250, sharePartition.nextFetchOffset());
@@ -4118,13 +4119,13 @@ public class SharePartitionTest {
public void testMaybeUpdateCachedStateWhenAcknowledgementTypeReject() {
SharePartition sharePartition = SharePartitionBuilder.builder().build();
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(250, 0),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(250, 0),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertFalse(sharePartition.canAcquireRecords());
- sharePartition.acknowledge("member-1", Collections.singletonList(
+ sharePartition.acknowledge(MEMBER_ID, Collections.singletonList(
new ShareAcknowledgementBatch(0, 249, Collections.singletonList((byte) 3))));
assertEquals(250, sharePartition.nextFetchOffset());
@@ -4140,12 +4141,12 @@ public class SharePartitionTest {
public void testMaybeUpdateCachedStateWhenAcknowledgementTypeRelease() {
SharePartition sharePartition = SharePartitionBuilder.builder().build();
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(250, 0),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(250, 0),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertFalse(sharePartition.canAcquireRecords());
- sharePartition.acknowledge("member-1", Collections.singletonList(
+ sharePartition.acknowledge(MEMBER_ID, Collections.singletonList(
new ShareAcknowledgementBatch(0, 249, Collections.singletonList((byte) 2))));
// The SPSO should only move when the initial records in cached state are acknowledged with type ACKNOWLEDGE or ARCHIVED.
@@ -4163,17 +4164,17 @@ public class SharePartitionTest {
public void testMaybeUpdateCachedStateWhenAcknowledgementsFromBeginningForBatchSubset() {
SharePartition sharePartition = SharePartitionBuilder.builder().withMaxInflightMessages(20).build();
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 0),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 0),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertTrue(sharePartition.canAcquireRecords());
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 15),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 15),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertFalse(sharePartition.canAcquireRecords());
- sharePartition.acknowledge("member-1", Collections.singletonList(
+ sharePartition.acknowledge(MEMBER_ID, Collections.singletonList(
new ShareAcknowledgementBatch(0, 12, Collections.singletonList((byte) 1))));
assertEquals(RecordState.ACKNOWLEDGED, sharePartition.cachedState().get(0L).offsetState().get(12L).state());
@@ -4189,21 +4190,21 @@ public class SharePartitionTest {
@Test
public void testMaybeUpdateCachedStateWhenAcknowledgementsFromBeginningForEntireBatch() {
SharePartition sharePartition = SharePartitionBuilder.builder().withMaxInflightMessages(20).build();
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 0),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 0),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertTrue(sharePartition.canAcquireRecords());
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 15),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 15),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertFalse(sharePartition.canAcquireRecords());
- sharePartition.acknowledge("member-1", Collections.singletonList(
+ sharePartition.acknowledge(MEMBER_ID, Collections.singletonList(
new ShareAcknowledgementBatch(0, 14, Collections.singletonList((byte) 3))));
assertEquals(RecordState.ACQUIRED, sharePartition.cachedState().get(15L).batchState());
- assertEquals("member-1", sharePartition.cachedState().get(15L).batchMemberId());
+ assertEquals(MEMBER_ID, sharePartition.cachedState().get(15L).batchMemberId());
assertEquals(1, sharePartition.cachedState().get(15L).batchDeliveryCount());
assertTrue(sharePartition.canAcquireRecords());
@@ -4216,24 +4217,24 @@ public class SharePartitionTest {
public void testMaybeUpdateCachedStateWhenAcknowledgementsInBetween() {
SharePartition sharePartition = SharePartitionBuilder.builder().withMaxInflightMessages(20).build();
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 0),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 0),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertTrue(sharePartition.canAcquireRecords());
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 15),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 15),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertFalse(sharePartition.canAcquireRecords());
- sharePartition.acknowledge("member-1", Collections.singletonList(
+ sharePartition.acknowledge(MEMBER_ID, Collections.singletonList(
new ShareAcknowledgementBatch(10, 14, Collections.singletonList((byte) 3))));
assertEquals(RecordState.ACQUIRED, sharePartition.cachedState().get(0L).offsetState().get(9L).state());
assertEquals(RecordState.ARCHIVED, sharePartition.cachedState().get(0L).offsetState().get(10L).state());
assertEquals(RecordState.ACQUIRED, sharePartition.cachedState().get(15L).batchState());
- assertEquals("member-1", sharePartition.cachedState().get(15L).batchMemberId());
+ assertEquals(MEMBER_ID, sharePartition.cachedState().get(15L).batchMemberId());
assertEquals(1, sharePartition.cachedState().get(15L).batchDeliveryCount());
assertFalse(sharePartition.canAcquireRecords());
@@ -4246,17 +4247,17 @@ public class SharePartitionTest {
public void testMaybeUpdateCachedStateWhenAllRecordsInCachedStateAreAcknowledged() {
SharePartition sharePartition = SharePartitionBuilder.builder().withMaxInflightMessages(20).build();
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 0),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 0),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertTrue(sharePartition.canAcquireRecords());
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 15),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(15, 15),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertFalse(sharePartition.canAcquireRecords());
- sharePartition.acknowledge("member-1", Collections.singletonList(
+ sharePartition.acknowledge(MEMBER_ID, Collections.singletonList(
new ShareAcknowledgementBatch(0, 29, Collections.singletonList((byte) 1))));
assertTrue(sharePartition.canAcquireRecords());
@@ -4269,23 +4270,23 @@ public class SharePartitionTest {
public void testMaybeUpdateCachedStateMultipleAcquisitionsAndAcknowledgements() {
SharePartition sharePartition = SharePartitionBuilder.builder().withMaxInflightMessages(100).build();
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(20, 0),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(20, 0),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertTrue(sharePartition.canAcquireRecords());
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(20, 20),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(20, 20),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertTrue(sharePartition.canAcquireRecords());
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(20, 40),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(20, 40),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertTrue(sharePartition.canAcquireRecords());
// First Acknowledgement for the first batch of records 0-19.
- sharePartition.acknowledge("member-1", Collections.singletonList(
+ sharePartition.acknowledge(MEMBER_ID, Collections.singletonList(
new ShareAcknowledgementBatch(0, 19, Collections.singletonList((byte) 1))));
assertTrue(sharePartition.canAcquireRecords());
@@ -4293,12 +4294,12 @@ public class SharePartitionTest {
assertEquals(59, sharePartition.endOffset());
assertEquals(60, sharePartition.nextFetchOffset());
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(20, 60),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(20, 60),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertTrue(sharePartition.canAcquireRecords());
- sharePartition.acknowledge("member-1", Collections.singletonList(
+ sharePartition.acknowledge(MEMBER_ID, Collections.singletonList(
new ShareAcknowledgementBatch(20, 49, Collections.singletonList((byte) 1))));
assertEquals(RecordState.ACKNOWLEDGED, sharePartition.cachedState().get(40L).offsetState().get(49L).state());
@@ -4309,13 +4310,13 @@ public class SharePartitionTest {
assertEquals(79, sharePartition.endOffset());
assertEquals(80, sharePartition.nextFetchOffset());
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(100, 80),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(100, 80),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertFalse(sharePartition.canAcquireRecords());
// Final Acknowledgment, all records are acknowledged here.
- sharePartition.acknowledge("member-1", Collections.singletonList(
+ sharePartition.acknowledge(MEMBER_ID, Collections.singletonList(
new ShareAcknowledgementBatch(50, 179, Collections.singletonList((byte) 3))));
assertEquals(0, sharePartition.cachedState().size());
@@ -4324,7 +4325,7 @@ public class SharePartitionTest {
assertEquals(180, sharePartition.endOffset());
assertEquals(180, sharePartition.nextFetchOffset());
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(20, 180),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(20, 180),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
@@ -4343,7 +4344,7 @@ public class SharePartitionTest {
assertEquals(0, sharePartition.startOffset());
assertEquals(0, sharePartition.endOffset());
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(150, 0),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(150, 0),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
@@ -4359,13 +4360,13 @@ public class SharePartitionTest {
assertEquals(0, sharePartition.startOffset());
assertEquals(0, sharePartition.endOffset());
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(150, 0),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(150, 0),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
assertTrue(sharePartition.canAcquireRecords());
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(100, 150),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(100, 150),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
@@ -4373,7 +4374,7 @@ public class SharePartitionTest {
assertEquals(0, sharePartition.startOffset());
assertEquals(249, sharePartition.endOffset());
- sharePartition.acknowledge("member-1", Collections.singletonList(
+ sharePartition.acknowledge(MEMBER_ID, Collections.singletonList(
new ShareAcknowledgementBatch(0, 249, Collections.singletonList((byte) 1))));
assertTrue(sharePartition.canAcquireRecords());
@@ -4385,7 +4386,7 @@ public class SharePartitionTest {
public void testCanAcquireRecordsAfterReleaseAcknowledgement() {
SharePartition sharePartition = SharePartitionBuilder.builder().build();
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(150, 0),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(150, 0),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
@@ -4393,7 +4394,7 @@ public class SharePartitionTest {
assertEquals(0, sharePartition.startOffset());
assertEquals(149, sharePartition.endOffset());
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(100, 150),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(100, 150),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
@@ -4401,7 +4402,7 @@ public class SharePartitionTest {
assertEquals(0, sharePartition.startOffset());
assertEquals(249, sharePartition.endOffset());
- sharePartition.acknowledge("member-1", Collections.singletonList(
+ sharePartition.acknowledge(MEMBER_ID, Collections.singletonList(
new ShareAcknowledgementBatch(0, 89, Collections.singletonList((byte) 2))));
// The SPSO should only move when the initial records in cached state are acknowledged with type ACKNOWLEDGE or ARCHIVED.
@@ -4415,7 +4416,7 @@ public class SharePartitionTest {
public void testCanAcquireRecordsAfterArchiveAcknowledgement() {
SharePartition sharePartition = SharePartitionBuilder.builder().build();
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(150, 0),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(150, 0),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
@@ -4423,7 +4424,7 @@ public class SharePartitionTest {
assertEquals(0, sharePartition.startOffset());
assertEquals(149, sharePartition.endOffset());
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(100, 150),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(100, 150),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
@@ -4431,7 +4432,7 @@ public class SharePartitionTest {
assertEquals(0, sharePartition.startOffset());
assertEquals(249, sharePartition.endOffset());
- sharePartition.acknowledge("member-1", Collections.singletonList(
+ sharePartition.acknowledge(MEMBER_ID, Collections.singletonList(
new ShareAcknowledgementBatch(0, 89, Collections.singletonList((byte) 3))));
// The SPSO should only move when the initial records in cached state are acknowledged with type ACKNOWLEDGE or ARCHIVED.
@@ -4444,7 +4445,7 @@ public class SharePartitionTest {
public void testCanAcquireRecordsAfterAcceptAcknowledgement() {
SharePartition sharePartition = SharePartitionBuilder.builder().build();
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(150, 0),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(150, 0),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
@@ -4452,14 +4453,14 @@ public class SharePartitionTest {
assertEquals(0, sharePartition.startOffset());
assertEquals(149, sharePartition.endOffset());
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(100, 150),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(100, 150),
Optional.empty(), OptionalLong.empty(), Optional.empty(), OptionalInt.empty(), false));
assertFalse(sharePartition.canAcquireRecords());
assertEquals(0, sharePartition.startOffset());
assertEquals(249, sharePartition.endOffset());
- sharePartition.acknowledge("member-1", Collections.singletonList(
+ sharePartition.acknowledge(MEMBER_ID, Collections.singletonList(
new ShareAcknowledgementBatch(0, 89, Collections.singletonList((byte) 1))));
// The SPSO should only move when the initial records in cached state are acknowledged with type ACKNOWLEDGE or ARCHIVED.
@@ -4539,11 +4540,11 @@ public class SharePartitionTest {
public void testAcknowledgeSubsetWithAnotherMember() {
SharePartition sharePartition = SharePartitionBuilder.builder().build();
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 30, 0, memoryRecords(7, 5),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 30, 0, memoryRecords(7, 5),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
- sharePartition.acknowledge("member-1",
+ sharePartition.acknowledge(MEMBER_ID,
Collections.singletonList(new ShareAcknowledgementBatch(5, 7, Collections.singletonList((byte) 1))));
// Acknowledge subset with another member.
@@ -4557,7 +4558,7 @@ public class SharePartitionTest {
public void testAcknowledgeWithAnotherMemberRollbackBatchError() {
SharePartition sharePartition = SharePartitionBuilder.builder().build();
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(5, 5),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(5, 5),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
@@ -4565,11 +4566,11 @@ public class SharePartitionTest {
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(5, 15),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(5, 15),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
- CompletableFuture<Void> ackResult = sharePartition.acknowledge("member-1", Arrays.asList(
+ CompletableFuture<Void> ackResult = sharePartition.acknowledge(MEMBER_ID, Arrays.asList(
new ShareAcknowledgementBatch(5, 9, Collections.singletonList((byte) 2)),
// Acknowledging batch with another member will cause failure and rollback.
new ShareAcknowledgementBatch(10, 14, Collections.singletonList((byte) 1)),
@@ -4580,13 +4581,13 @@ public class SharePartitionTest {
// State should be rolled back to the previous state for any changes.
assertEquals(RecordState.ACQUIRED, sharePartition.cachedState().get(5L).batchState());
- assertEquals("member-1", sharePartition.cachedState().get(5L).batchMemberId());
+ assertEquals(MEMBER_ID, sharePartition.cachedState().get(5L).batchMemberId());
assertEquals(1, sharePartition.cachedState().get(5L).batchDeliveryCount());
assertEquals(RecordState.ACQUIRED, sharePartition.cachedState().get(10L).batchState());
assertEquals("member-2", sharePartition.cachedState().get(10L).batchMemberId());
assertEquals(1, sharePartition.cachedState().get(10L).batchDeliveryCount());
assertEquals(RecordState.ACQUIRED, sharePartition.cachedState().get(15L).batchState());
- assertEquals("member-1", sharePartition.cachedState().get(15L).batchMemberId());
+ assertEquals(MEMBER_ID, sharePartition.cachedState().get(15L).batchMemberId());
assertEquals(1, sharePartition.cachedState().get(15L).batchDeliveryCount());
}
@@ -4594,11 +4595,11 @@ public class SharePartitionTest {
public void testAcknowledgeWithAnotherMemberRollbackSubsetError() {
SharePartition sharePartition = SharePartitionBuilder.builder().build();
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(5, 5),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(5, 5),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(5, 10),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 20, 0, memoryRecords(5, 10),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
@@ -4606,7 +4607,7 @@ public class SharePartitionTest {
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
- CompletableFuture<Void> ackResult = sharePartition.acknowledge("member-1", Arrays.asList(
+ CompletableFuture<Void> ackResult = sharePartition.acknowledge(MEMBER_ID, Arrays.asList(
new ShareAcknowledgementBatch(5, 9, Collections.singletonList((byte) 2)),
new ShareAcknowledgementBatch(10, 14, Collections.singletonList((byte) 1)),
// Acknowledging subset with another member will cause failure and rollback.
@@ -4617,10 +4618,10 @@ public class SharePartitionTest {
assertEquals(3, sharePartition.cachedState().size());
// Check the state of the cache. State should be rolled back to the previous state for any changes.
assertEquals(RecordState.ACQUIRED, sharePartition.cachedState().get(5L).batchState());
- assertEquals("member-1", sharePartition.cachedState().get(5L).batchMemberId());
+ assertEquals(MEMBER_ID, sharePartition.cachedState().get(5L).batchMemberId());
assertEquals(1, sharePartition.cachedState().get(5L).batchDeliveryCount());
assertEquals(RecordState.ACQUIRED, sharePartition.cachedState().get(10L).batchState());
- assertEquals("member-1", sharePartition.cachedState().get(10L).batchMemberId());
+ assertEquals(MEMBER_ID, sharePartition.cachedState().get(10L).batchMemberId());
assertEquals(1, sharePartition.cachedState().get(10L).batchDeliveryCount());
assertEquals(RecordState.ACQUIRED, sharePartition.cachedState().get(15L).batchState());
assertEquals("member-2", sharePartition.cachedState().get(15L).batchMemberId());
@@ -4767,7 +4768,7 @@ public class SharePartitionTest {
public void testNextFetchOffsetWithMultipleConsumers() {
SharePartition sharePartition = SharePartitionBuilder.builder().withMaxInflightMessages(100).build();
MemoryRecords records1 = memoryRecords(3, 0);
- String memberId1 = "member-1";
+ String memberId1 = MEMBER_ID;
String memberId2 = "member-2";
sharePartition.acquire(memberId1, new FetchPartitionData(Errors.NONE, 20, 0, records1,
@@ -4818,15 +4819,15 @@ public class SharePartitionTest {
SharePartition sharePartition = SharePartitionBuilder.builder().build();
MemoryRecords records1 = memoryRecords(5, 5);
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 30, 0, records1,
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 30, 0, records1,
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
- sharePartition.acquire("member-1", new FetchPartitionData(Errors.NONE, 30, 0, memoryRecords(12, 10),
+ sharePartition.acquire(MEMBER_ID, new FetchPartitionData(Errors.NONE, 30, 0, memoryRecords(12, 10),
Optional.empty(), OptionalLong.empty(), Optional.empty(),
OptionalInt.empty(), false));
- sharePartition.acknowledge("member-1", Arrays.asList(
+ sharePartition.acknowledge(MEMBER_ID, Arrays.asList(
new ShareAcknowledgementBatch(5, 11, Collections.singletonList((byte) 2)),
new ShareAcknowledgementBatch(12, 13, Collections.singletonList((byte) 0)),
new ShareAcknowledgementBatch(14, 15, Collections.singletonList((byte) 2)),
@@ -4860,12 +4861,12 @@ public class SharePartitionTest {
expectedOffsetStateMap.put(15L, new InFlightState(RecordState.ACQUIRED, (short) 2, "member-2"));
// Record 16 was not released in the acknowledgements. It was included in the reacquire by member-2,
// still its ownership is with member-1 and delivery count is 1.
- expectedOffsetStateMap.put(16L, new InFlightState(RecordState.ACQUIRED, (short) 1, "member-1"));
+ expectedOffsetStateMap.put(16L, new InFlightState(RecordState.ACQUIRED, (short) 1, MEMBER_ID));
expectedOffsetStateMap.put(17L, new InFlightState(RecordState.AVAILABLE, (short) 1, EMPTY_MEMBER_ID));
expectedOffsetStateMap.put(18L, new InFlightState(RecordState.AVAILABLE, (short) 1, EMPTY_MEMBER_ID));
expectedOffsetStateMap.put(19L, new InFlightState(RecordState.AVAILABLE, (short) 1, EMPTY_MEMBER_ID));
expectedOffsetStateMap.put(20L, new InFlightState(RecordState.AVAILABLE, (short) 1, EMPTY_MEMBER_ID));
- expectedOffsetStateMap.put(21L, new InFlightState(RecordState.ACQUIRED, (short) 1, "member-1"));
+ expectedOffsetStateMap.put(21L, new InFlightState(RecordState.ACQUIRED, (short) 1, MEMBER_ID));
assertEquals(expectedOffsetStateMap, sharePartition.cachedState().get(10L).offsetState());
}