Skip to content

[fix][test]Flaky test testMaxPendingChunkMessages #21103

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
Technoboy- merged 4 commits into from
Sep 7, 2023
Merged

[fix][test]Flaky test testMaxPendingChunkMessages #21103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
75e33a5
[fix][test]Flaky test testMaxPendingChunkMessages
liangyepianzhou Aug 31, 2023
10056d4
optimize
liangyepianzhou Aug 31, 2023
a5e9055
add some note and optimize the test
liangyepianzhou Sep 7, 2023
41a56cf
fix
liangyepianzhou Sep 7, 2023
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
21 changes: 19 additions & 2 deletions pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MessageChunkingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
import org.apache.pulsar.common.protocol.Commands;
import org.apache.pulsar.common.protocol.Commands.ChecksumType;
import org.apache.pulsar.common.util.FutureUtil;
import org.awaitility.Awaitility;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.testng.Assert;
Expand Down Expand Up @@ -319,15 +320,29 @@ private void sendSingleChunk(Producer<String> producer, String uuid, int chunkId
msg.send();
}

/**
* This test used to test the consumer configuration of maxPendingChunkedMessage.
* If we set maxPendingChunkedMessage is 1 that means only one incomplete chunk message can be store in this
* consumer.
* For example:
* ChunkMessage1 chunk-1: uuid = 0, chunkId = 0, totalChunk = 2;
* ChunkMessage2 chunk-1: uuid = 1, chunkId = 0, totalChunk = 2;
* ChunkMessage2 chunk-2: uuid = 1, chunkId = 1, totalChunk = 2;
* ChunkMessage1 chunk-2: uuid = 0, chunkId = 1, totalChunk = 2;
* The chunk-1 in the ChunkMessage1 and ChunkMessage2 all is incomplete.
* chunk-1 in the ChunkMessage1 will be discarded and acked when receive the chunk-1 in the ChunkMessage2.
* If ack ChunkMessage2 and redeliver unacknowledged messages, the consumer can not receive any message again.
* @throws Exception
*/
@Test
public void testMaxPendingChunkMessages() throws Exception {
log.info("-- Starting {} test --", methodName);
final String topicName = "persistent://my-property/my-ns/maxPending";

final String subName = "my-subscriber-name";
@Cleanup
Consumer<String> consumer = pulsarClient.newConsumer(Schema.STRING)
.topic(topicName)
.subscriptionName("my-subscriber-name")
.subscriptionName(subName)
.maxPendingChunkedMessage(1)
.autoAckOldestChunkedMessageOnQueueFull(true)
.subscribe();
Expand All @@ -348,6 +363,8 @@ public void testMaxPendingChunkMessages() throws Exception {
assertEquals(receivedMsg.getValue(), "chunk-1-0|chunk-1-1|");

consumer.acknowledge(receivedMsg);
Awaitility.await().untilAsserted(() -> assertEquals(admin.topics().getStats(topicName)
.getSubscriptions().get(subName).getNonContiguousDeletedMessagesRanges(), 0));
consumer.redeliverUnacknowledgedMessages();

sendSingleChunk(producer, "0", 1, 2);
Expand Down
7 changes: 4 additions & 3 deletions pulsar-client/src/main/java/org/apache/pulsar/client/impl/ConsumerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1486,9 +1486,10 @@ private ByteBuf processMessageChunk(ByteBuf compressedPayload, MessageMetadata m
return null;
}
// means we lost the first chunk: should never happen
log.info("[{}] [{}] Received unexpected chunk messageId {}, last-chunk-id = {}, chunkId = {}", topic,
subscription, msgId,
(chunkedMsgCtx != null ? chunkedMsgCtx.lastChunkedMessageId : null), msgMetadata.getChunkId());
log.info("[{}] [{}] Received unexpected chunk messageId {}, last-chunk-id = {}, chunkId = {}, uuid = {}",
topic, subscription, msgId,
(chunkedMsgCtx != null ? chunkedMsgCtx.lastChunkedMessageId : null), msgMetadata.getChunkId(),
msgMetadata.getUuid());
if (chunkedMsgCtx != null) {
if (chunkedMsgCtx.chunkedMsgBuffer != null) {
ReferenceCountUtil.safeRelease(chunkedMsgCtx.chunkedMsgBuffer);
Expand Down