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

Optimize memory usage: support to shrink for pendingAcks map #14515

Merged
merged 13 commits into from
Mar 5, 2022
Merged

Optimize memory usage: support to shrink for pendingAcks map #14515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
46da1bb
support to shrink for pendingAcks map
lordcheng10 Mar 1, 2022
3bf9b2e
1. rename autoShrink to autoShrinkForConsumerPendingAcksMap;
lordcheng10 Mar 1, 2022
3a86de1
check style
lordcheng10 Mar 1, 2022
2508c75
use AtomicIntegerFieldUpdater for size
lordcheng10 Mar 2, 2022
9269688
check style
lordcheng10 Mar 2, 2022
53cef2e
check style
lordcheng10 Mar 2, 2022
898a5cb
check style
lordcheng10 Mar 2, 2022
307209e
check style
lordcheng10 Mar 2, 2022
59a2456
1. add unit test; 2. update config describe;
lordcheng10 Mar 2, 2022
ac007f0
check style
lordcheng10 Mar 2, 2022
8de537a
check style
lordcheng10 Mar 2, 2022
f843d8f
remove unused import
lordcheng10 Mar 2, 2022
0c285af
remove static variable for autoShrinkForConsumerPendingAcksMap
lordcheng10 Mar 3, 2022
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
8 changes: 8 additions & 0 deletions pulsar-broker-common/src/main/java/org/apache/pulsar/broker/ServiceConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,6 +704,14 @@ public class ServiceConfiguration implements PulsarConfiguration {
)
private boolean isAllowAutoUpdateSchemaEnabled = true;

@FieldContext(
category = CATEGORY_SERVER,
doc = "Whether to enable the automatic shrink of pendingAcks map, "
+ "the default is false, which means it is not enabled. "
+ "When there are a large number of share or key share consumers in the cluster, "
+ "it can be enabled to reduce the memory consumption caused by pendingAcks.")
private boolean autoShrinkForConsumerPendingAcksMap = false;

@FieldContext(
category = CATEGORY_SERVER,
dynamic = true,
Expand Down
11 changes: 8 additions & 3 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/service/Consumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,6 @@
import org.apache.bookkeeper.mledger.Entry;
import org.apache.bookkeeper.mledger.Position;
import org.apache.bookkeeper.mledger.impl.PositionImpl;
import org.apache.bookkeeper.util.collections.ConcurrentLongLongPairHashMap;
import org.apache.bookkeeper.util.collections.ConcurrentLongLongPairHashMap.LongPair;
import org.apache.commons.lang3.mutable.MutableInt;
import org.apache.commons.lang3.tuple.MutablePair;
import org.apache.pulsar.broker.service.persistent.PersistentSubscription;
Expand All @@ -61,6 +59,8 @@
import org.apache.pulsar.common.util.DateFormatter;
import org.apache.pulsar.common.util.FutureUtil;
import org.apache.pulsar.common.util.collections.BitSetRecyclable;
import org.apache.pulsar.common.util.collections.ConcurrentLongLongPairHashMap;
import org.apache.pulsar.common.util.collections.ConcurrentLongLongPairHashMap.LongPair;
import org.apache.pulsar.transaction.common.exception.TransactionConflictException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -186,7 +186,12 @@ public Consumer(Subscription subscription, SubType subType, String topicName, lo
stats.metadata = this.metadata;

if (Subscription.isIndividualAckMode(subType)) {
this.pendingAcks = new ConcurrentLongLongPairHashMap(256, 1);
this.pendingAcks = ConcurrentLongLongPairHashMap.newBuilder()
.autoShrink(subscription.getTopic().getBrokerService()
.getPulsar().getConfiguration().isAutoShrinkForConsumerPendingAcksMap())
.expectedItems(256)
.concurrencyLevel(1)
.build();
} else {
// We don't need to keep track of pending acks if the subscription is not shared
this.pendingAcks = null;
Expand Down
Loading