Skip to content
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

Jump to bottom

Pulsar outgoing max pending messages rename #2574

Merged
merged 4 commits into from
Apr 11, 2024
Merged

Pulsar outgoing max pending messages rename #2574

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
a9719f0
Release message on ack, enabling use of poolMessages config
ozangunalp Apr 9, 2024
16fbb7c
Bump PulsarContainer version
ozangunalp Apr 9, 2024
bb14132
Remove tmpfs from PulsarContainer
ozangunalp Apr 9, 2024
df3aa74
Pulsar outgoing channel: Rename Pulsar maxPendingMessages to max-infl…
ozangunalp Apr 9, 2024
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
2 changes: 1 addition & 1 deletion ...messaging-pulsar/src/main/java/io/smallrye/reactive/messaging/pulsar/PulsarConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
@ConnectorAttribute(name = "batchReceive", type = "boolean", direction = ConnectorAttribute.Direction.INCOMING, description = "Whether batch receive is used to consume messages", defaultValue = "false")

@ConnectorAttribute(name = "producer-configuration", type = "string", direction = ConnectorAttribute.Direction.OUTGOING, description = "Identifier of a CDI bean that provides the default Pulsar producer configuration for this channel. The channel configuration can still override any attribute. The bean must have a type of Map<String, Object> and must use the @io.smallrye.common.annotation.Identifier qualifier to set the identifier.")
@ConnectorAttribute(name = "maxPendingMessages", type = "int", direction = ConnectorAttribute.Direction.OUTGOING, description = "The maximum size of a queue holding pending messages, i.e messages waiting to receive an acknowledgment from a broker", defaultValue = "1000")
@ConnectorAttribute(name = "max-inflight-messages", type = "int", direction = ConnectorAttribute.Direction.OUTGOING, description = "The maximum size of a queue holding pending messages, i.e messages waiting to receive an acknowledgment from a broker. Defaults to 1000 messages")
@ConnectorAttribute(name = "waitForWriteCompletion", type = "boolean", direction = ConnectorAttribute.Direction.OUTGOING, description = "Whether the client waits for the broker to acknowledge the written record before acknowledging the message", defaultValue = "true")
public class PulsarConnector implements InboundConnector, OutboundConnector, HealthReporter {

Expand Down
23 changes: 19 additions & 4 deletions ...ing-pulsar/src/main/java/io/smallrye/reactive/messaging/pulsar/PulsarOutgoingChannel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ public PulsarOutgoingChannel(PulsarClient client, Schema<T> schema, PulsarConnec
if (conf.getTopicName() == null) {
conf.setTopicName(oc.getTopic().orElse(channel));
}
if (conf.getMaxPendingMessages() > 0 && conf.getMaxPendingMessagesAcrossPartitions() == 0) {
conf.setMaxPendingMessagesAcrossPartitions(conf.getMaxPendingMessages());
}
Map<String, Object> producerConf = configResolver.configToMap(conf);
ProducerBuilder<T> builder = client.newProducer(schema)
.loadConf(producerConf);
Expand All @@ -68,10 +71,7 @@ public PulsarOutgoingChannel(PulsarClient client, Schema<T> schema, PulsarConnec
}
this.producer = builder.create();
log.createdProducerWithConfig(channel, SchemaResolver.getSchemaName(schema), conf);
long requests = oc.getMaxPendingMessages();
if (requests <= 0) {
requests = Long.MAX_VALUE;
}
long requests = getRequests(oc, conf);

processor = new SenderProcessor(requests, oc.getWaitForWriteCompletion(), this::sendMessage);
subscriber = MultiUtils.via(processor, m -> m.onFailure().invoke(f -> {
Expand All @@ -86,6 +86,21 @@ public PulsarOutgoingChannel(PulsarClient client, Schema<T> schema, PulsarConnec
}
}

private long getRequests(PulsarConnectorOutgoingConfiguration oc, ProducerConfigurationData conf) {
Optional<Integer> maxInflightMessages = oc.getMaxInflightMessages();
if (maxInflightMessages.isPresent()) {
if (maxInflightMessages.get() <= 0) {
return Long.MAX_VALUE;
} else {
return maxInflightMessages.get();
}
} else if (producer.getNumOfPartitions() > 1 && conf.getMaxPendingMessagesAcrossPartitions() > 0) {
return conf.getMaxPendingMessagesAcrossPartitions();
} else {
return 1000;
}
}

private Uni<Void> sendMessage(Message<?> message) {
return Uni.createFrom().item(message)
.onItem().transform(m -> toMessageBuilder(m, producer))
Expand Down
7 changes: 5 additions & 2 deletions ...g-pulsar/src/main/java/io/smallrye/reactive/messaging/pulsar/ack/PulsarCumulativeAck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import jakarta.enterprise.context.ApplicationScoped;

import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.MessageId;

import io.smallrye.common.annotation.Identifier;
import io.smallrye.mutiny.Uni;
Expand Down Expand Up @@ -33,12 +34,14 @@ public PulsarCumulativeAck(Consumer<?> consumer) {

@Override
public Uni<Void> handle(PulsarIncomingMessage<?> message) {
MessageId messageId = message.getMessageId();
message.unwrap().release();
return Uni.createFrom().completionStage(() -> {
var txnMetadata = message.getMetadata(PulsarTransactionMetadata.class);
if (txnMetadata.isPresent()) {
return consumer.acknowledgeCumulativeAsync(message.getMessageId(), txnMetadata.get().getTransaction());
return consumer.acknowledgeCumulativeAsync(messageId, txnMetadata.get().getTransaction());
} else {
return consumer.acknowledgeCumulativeAsync(message.getMessageId());
return consumer.acknowledgeCumulativeAsync(messageId);
}
})
.emitOn(message::runOnMessageContext);
Expand Down
8 changes: 6 additions & 2 deletions ...ging-pulsar/src/main/java/io/smallrye/reactive/messaging/pulsar/ack/PulsarMessageAck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import jakarta.enterprise.context.ApplicationScoped;

import org.apache.pulsar.client.api.Consumer;
import org.apache.pulsar.client.api.MessageId;

import io.smallrye.common.annotation.Identifier;
import io.smallrye.mutiny.Uni;
Expand Down Expand Up @@ -35,12 +36,15 @@ public PulsarMessageAck(Consumer<?> consumer) {

@Override
public Uni<Void> handle(PulsarIncomingMessage<?> message) {
MessageId messageId = message.getMessageId();
message.unwrap().release();
return Uni.createFrom().completionStage(() -> {
var txnMetadata = message.getMetadata(PulsarTransactionMetadata.class);
if (txnMetadata.isPresent()) {
return consumer.acknowledgeAsync(message.getMessageId(), txnMetadata.get().getTransaction());
message.unwrap().release();
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Duplicated line 40.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call! Thanks!

return consumer.acknowledgeAsync(messageId, txnMetadata.get().getTransaction());
} else {
return consumer.acknowledgeAsync(message.getMessageId());
return consumer.acknowledgeAsync(messageId);
}
})
.onFailure().invoke(log::unableToAcknowledgeMessage)
Expand Down
4 changes: 1 addition & 3 deletions ...ging-pulsar/src/test/java/io/smallrye/reactive/messaging/pulsar/base/PulsarContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.Collections;

import org.testcontainers.containers.GenericContainer;
import org.testcontainers.containers.wait.strategy.Wait;
Expand All @@ -13,7 +12,7 @@

public class PulsarContainer extends GenericContainer<PulsarContainer> {

public static final DockerImageName PULSAR_IMAGE = DockerImageName.parse("apachepulsar/pulsar:3.0.0");
public static final DockerImageName PULSAR_IMAGE = DockerImageName.parse("apachepulsar/pulsar:3.2.2");

public static final String STARTER_SCRIPT = "/run_pulsar.sh";

Expand All @@ -30,7 +29,6 @@ public PulsarContainer(DockerImageName imageName) {
super.withStartupTimeout(Duration.ofSeconds(60));
super.waitingFor(Wait.forLogMessage(".*Created namespace public/default.*", 1));
super.withCommand("sh", "-c", runStarterScript());
super.withTmpFs(Collections.singletonMap("/pulsar/data", "rw"));
}

protected String runStarterScript() {
Expand Down
44 changes: 38 additions & 6 deletions ...sar/src/test/java/io/smallrye/reactive/messaging/pulsar/perf/EndToEndPayloadPerfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,19 @@
import java.util.concurrent.TimeUnit;

import jakarta.enterprise.context.ApplicationScoped;
import jakarta.enterprise.inject.Any;
import jakarta.inject.Inject;

import org.apache.pulsar.client.api.MessageId;
import org.apache.pulsar.client.api.PulsarClientException;
import org.apache.pulsar.client.api.Schema;
import org.apache.pulsar.client.api.SubscriptionInitialPosition;
import org.apache.pulsar.client.impl.PulsarClientImpl;
import org.eclipse.microprofile.reactive.messaging.Incoming;
import org.eclipse.microprofile.reactive.messaging.Message;
import org.eclipse.microprofile.reactive.messaging.Outgoing;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;

Expand All @@ -39,44 +42,59 @@
*/
@Tag(TestTags.PERFORMANCE)
@Tag(TestTags.SLOW)
@Disabled
public class EndToEndPayloadPerfTest extends WeldTestBase {

public static final int COUNT = 10_000;
public static String input_topic = UUID.randomUUID().toString();
public static String output_topic = UUID.randomUUID().toString();
public String output_topic = UUID.randomUUID().toString();

@BeforeAll
static void insertRecords() throws PulsarClientException {
send(client.newProducer(Schema.BYTES)
.producerName("consumer-perf")
.topic(input_topic)
.create(), COUNT, (i, p) -> p.newMessage().key("key").value(generateRandomPayload(10000)));
.create(), COUNT, (i, p) -> p.newMessage().key("key-" + i).value(generateRandomPayload(10 * 1024)));

}

@BeforeEach
void outputTopic() {
output_topic = UUID.randomUUID().toString();
}

private MapBasedConfig commonConfig() {
return new MapBasedConfig()
.with("mp.messaging.incoming.in.connector", PulsarConnector.CONNECTOR_NAME)
.with("mp.messaging.incoming.in.serviceUrl", serviceUrl)
.with("mp.messaging.incoming.in.topic", input_topic)
// .with("mp.messaging.incoming.in.poolMessages", true)
// .with("mp.messaging.incoming.in.autoScaledReceiverQueueSizeEnabled", true)
.with("mp.messaging.incoming.in.tracing-enabled", false)
.with("mp.messaging.incoming.in.cloud-events", false)
.with("mp.messaging.incoming.in.subscriptionInitialPosition", SubscriptionInitialPosition.Earliest)
.with("mp.messaging.incoming.in.schema", "BYTES")
.with("mp.messaging.outgoing.out.connector", PulsarConnector.CONNECTOR_NAME)
.with("mp.messaging.outgoing.out.topic", output_topic)
.with("mp.messaging.outgoing.out.serviceUrl", serviceUrl)
.with("mp.messaging.outgoing.out.batchingEnabled", false)
// .with("mp.messaging.outgoing.out.memoryLimitBytes", 128 * 1024 * 1024)
// .with("mp.messaging.outgoing.out.maxPendingMessages", 500)
// .with("mp.messaging.outgoing.out.maxPendingMessagesAcrossPartitions", 1000)
.with("mp.messaging.outgoing.out.schema", "BYTES");
}

private void waitForOutMessages() {
List<MessageId> messages = new CopyOnWriteArrayList<>();
try {
receive(client.newConsumer(Schema.BYTES)
.subscriptionName(topic + "-consumer-" + UUID.randomUUID())
.subscriptionName(output_topic + "-consumer-")
.subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
.poolMessages(true)
.topic(output_topic)
.subscribe(), COUNT, m -> messages.add(m.getMessageId()));
.subscribe(), COUNT, m -> {
messages.add(m.getMessageId());
m.release();
});
} catch (PulsarClientException e) {
throw new RuntimeException(e);
}
Expand Down Expand Up @@ -138,6 +156,20 @@ public void test_hard_worker_processor() {
waitForOutMessages();
}

@ApplicationScoped
public static class MemoryReporter {

@Inject
@Any
PulsarConnector connector;

public void printMemoryUsage(String channel) {
System.out.println("Memory Usage : "
+ ((PulsarClientImpl) connector.getClient(channel)).getMemoryLimitController().currentUsagePercent());
}

}

private static volatile long consumedCPU = System.nanoTime();

private static final Random RANDOM = new Random();
Expand Down
21 changes: 10 additions & 11 deletions ...ing-pulsar/src/test/java/io/smallrye/reactive/messaging/pulsar/perf/EndToEndPerfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import org.eclipse.microprofile.reactive.messaging.Message;
import org.eclipse.microprofile.reactive.messaging.Outgoing;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;

Expand All @@ -39,12 +39,11 @@
*/
@Tag(TestTags.PERFORMANCE)
@Tag(TestTags.SLOW)
@Disabled
public class EndToEndPerfTest extends WeldTestBase {

public static final int COUNT = 50_000;
public static final int COUNT = 30_000;
public static String input_topic = UUID.randomUUID().toString();
public static String output_topic = UUID.randomUUID().toString();
public String output_topic = UUID.randomUUID().toString();

@BeforeAll
static void insertRecords() throws PulsarClientException {
Expand All @@ -54,6 +53,11 @@ static void insertRecords() throws PulsarClientException {
.create(), COUNT, i -> Integer.toString(i));
}

@BeforeEach
void outputTopic() {
output_topic = UUID.randomUUID().toString();
}

private MapBasedConfig commonConfig() {
return new MapBasedConfig()
.with("mp.messaging.incoming.in.connector", PulsarConnector.CONNECTOR_NAME)
Expand All @@ -71,19 +75,14 @@ private void waitForOutMessages() {
List<MessageId> messages = new CopyOnWriteArrayList<>();
try {
receive(client.newConsumer(Schema.STRING)
.subscriptionName(output_topic + "-consumer-" + UUID.randomUUID())
.subscriptionName(output_topic + "-consumer-")
.topic(output_topic)
.subscriptionInitialPosition(SubscriptionInitialPosition.Earliest)
.subscribe(), COUNT, m -> messages.add(m.getMessageId()));
} catch (PulsarClientException e) {
throw new RuntimeException(e);
}
await()
.atMost(5, TimeUnit.MINUTES)
.until(() -> {
System.out.println(messages.size());
return messages.size() >= COUNT;
});
await().atMost(5, TimeUnit.MINUTES).until(() -> messages.size() >= COUNT);
}

@ApplicationScoped
Expand Down
Loading