Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -35,18 +35,18 @@

public class QueueLevelConsumerOrderInfoLockManager {
private static final Logger POP_LOGGER = LoggerFactory.getLogger(LoggerName.ROCKETMQ_POP_LOGGER_NAME);
private ConsumerOrderInfoManager consumerOrderInfoManager;

private final BrokerController brokerController;
private final Map<Key, Timeout> timeoutMap = new ConcurrentHashMap<>();
private final Timer timer;
private static final int TIMER_TICK_MS = 100;

public QueueLevelConsumerOrderInfoLockManager(BrokerController brokerController) {
this.brokerController = brokerController;
long tickMs = brokerController.getBrokerConfig().getPopOrderLockTimerTickMs();
int ticksPerWheel = brokerController.getBrokerConfig().getPopOrderLockTimerTicksPerWheel();
this.timer = new HashedWheelTimer(
new ThreadFactoryImpl("ConsumerOrderInfoLockManager_"),
TIMER_TICK_MS, TimeUnit.MILLISECONDS);
tickMs, TimeUnit.MILLISECONDS, ticksPerWheel);
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,7 @@ public void setUp() {
when(brokerController.getLiteEventDispatcher()).thenReturn(liteEventDispatcher);
when(brokerController.getPopLiteMessageProcessor()).thenReturn(popLiteMessageProcessor);
when(brokerController.getConsumerOffsetManager()).thenReturn(consumerOffsetManager);
when(brokerController.getBrokerConfig()).thenReturn(new BrokerConfig());

ConsumerOrderInfoManager consumerOrderInfoManager = new MemoryConsumerOrderInfoManager(brokerController);
when(popLiteMessageProcessor.getConsumerOrderInfoManager()).thenReturn(consumerOrderInfoManager);
Expand Down
20 changes: 20 additions & 0 deletions common/src/main/java/org/apache/rocketmq/common/BrokerConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,10 @@ public class BrokerConfig extends BrokerIdentity {

private int liteLagLatencyTopK = 50;

// HashedWheelTimer config for pop order lock manager
private long popOrderLockTimerTickMs = 100;
private int popOrderLockTimerTicksPerWheel = 512;

public String getConfigBlackList() {
return configBlackList;
}
Expand Down Expand Up @@ -2489,6 +2493,22 @@ public void setLiteLagLatencyTopK(int liteLagLatencyTopK) {
this.liteLagLatencyTopK = liteLagLatencyTopK;
}

public long getPopOrderLockTimerTickMs() {
return popOrderLockTimerTickMs;
}

public void setPopOrderLockTimerTickMs(long popOrderLockTimerTickMs) {
this.popOrderLockTimerTickMs = popOrderLockTimerTickMs;
}

public int getPopOrderLockTimerTicksPerWheel() {
return popOrderLockTimerTicksPerWheel;
}

public void setPopOrderLockTimerTicksPerWheel(int popOrderLockTimerTicksPerWheel) {
this.popOrderLockTimerTicksPerWheel = popOrderLockTimerTicksPerWheel;
}

public boolean isUseMessageFilterForNotification() {
return useMessageFilterForNotification;
}
Expand Down
Loading