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

[improve][broker] Improve SystemTopicBasedTopicPoliciesService reader to reduce GC pressure #23780

Merged
merged 2 commits into from
Jan 3, 2025
Merged

[improve][broker] Improve SystemTopicBasedTopicPoliciesService reader to reduce GC pressure #23780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ece3163
Make SystemTopicBasedTopicPoliciesService's reader use poolmessage to…
dao-jun Dec 24, 2024
850df7b
fix tests
dao-jun Dec 25, 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
14 changes: 11 additions & 3 deletions .../src/main/java/org/apache/pulsar/broker/service/SystemTopicBasedTopicPoliciesService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,11 @@ private void initPolicesCache(SystemTopicClient.Reader<PulsarEvent> reader, Comp
}
if (hasMore) {
reader.readNextAsync().thenAccept(msg -> {
refreshTopicPoliciesCache(msg);
try {
refreshTopicPoliciesCache(msg);
} finally {
msg.release();
}
if (log.isDebugEnabled()) {
log.debug("[{}] Loop next event reading for system topic.",
reader.getSystemTopic().getTopicName().getNamespaceObject());
Expand Down Expand Up @@ -506,8 +510,12 @@ private void readMorePoliciesAsync(SystemTopicClient.Reader<PulsarEvent> reader)
}
reader.readNextAsync()
.thenAccept(msg -> {
refreshTopicPoliciesCache(msg);
notifyListener(msg);
try {
refreshTopicPoliciesCache(msg);
notifyListener(msg);
} finally {
msg.release();
}
})
.whenComplete((__, ex) -> {
if (ex == null) {
Expand Down
1 change: 1 addition & 0 deletions ...roker/src/main/java/org/apache/pulsar/broker/systopic/TopicPoliciesSystemTopicClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ protected CompletableFuture<Reader<PulsarEvent>> newReaderAsyncInternal() {
.subscriptionRolePrefix(SystemTopicNames.SYSTEM_READER_PREFIX)
.startMessageId(MessageId.earliest)
.readCompacted(true)
.poolMessages(true)
.createAsync()
.thenApply(reader -> {
if (log.isDebugEnabled()) {
Expand Down
5 changes: 4 additions & 1 deletion pulsar-broker/src/test/java/org/apache/pulsar/broker/service/TopicPolicyTestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import java.util.Optional;
import java.util.concurrent.ExecutionException;
import lombok.Cleanup;
import org.apache.pulsar.client.api.Message;
import org.apache.pulsar.common.events.PulsarEvent;
import org.apache.pulsar.common.naming.TopicName;
import org.apache.pulsar.common.policies.data.TopicPolicies;
Expand Down Expand Up @@ -67,7 +68,9 @@ public static Optional<TopicPolicies> getTopicPoliciesBypassCache(TopicPoliciesS
.newReader();
PulsarEvent event = null;
while (reader.hasMoreEvents()) {
event = reader.readNext().getValue();
@Cleanup("release")
Message<PulsarEvent> message = reader.readNext();
event = message.getValue();
}
return Optional.ofNullable(event).map(e -> e.getTopicPoliciesEvent().getPolicies());
}
Expand Down
2 changes: 2 additions & 0 deletions ...rc/test/java/org/apache/pulsar/broker/systopic/NamespaceEventsSystemTopicServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ public void testSendAndReceiveNamespaceEvents() throws Exception {
.build();
systemTopicClientForNamespace1.newWriter().write(getEventKey(event), event);
SystemTopicClient.Reader reader = systemTopicClientForNamespace1.newReader();
@Cleanup("release")
Message<PulsarEvent> received = reader.readNext();
log.info("Receive pulsar event from system topic : {}", received.getValue());

Expand All @@ -139,6 +140,7 @@ public void testSendAndReceiveNamespaceEvents() throws Exception {

// test new reader read
SystemTopicClient.Reader reader1 = systemTopicClientForNamespace1.newReader();
@Cleanup("release")
Message<PulsarEvent> received1 = reader1.readNext();
log.info("Receive pulsar event from system topic : {}", received1.getValue());
Assert.assertEquals(received1.getValue(), event);
Expand Down
6 changes: 5 additions & 1 deletion ...ar-broker/src/test/java/org/apache/pulsar/broker/systopic/PartitionedSystemTopicTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,13 @@ public void testSystemTopicNotCheckExceed() throws Exception {

FutureUtil.waitForAll(List.of(writer1, writer2, f1)).join();
Assert.assertTrue(reader1.hasMoreEvents());
Assert.assertNotNull(reader1.readNext());
Message<?> message = reader1.readNext();
Assert.assertNotNull(message);
message.release();
Assert.assertTrue(reader2.hasMoreEvents());
message = reader2.readNext();
Assert.assertNotNull(reader2.readNext());
message.release();
reader1.close();
reader2.close();
writer1.get().close();
Expand Down
Loading