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

[ISSUE #8601]When isPopShouldStop hit,unlock queueLockManager #8602

Merged
merged 3 commits into from
Aug 30, 2024
Merged

[ISSUE #8601]When isPopShouldStop hit,unlock queueLockManager #8602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed51602
fix:when isPopShouldStop hit， unlock queueLockManager
leizhiyuan Aug 29, 2024
07f8282
fix:when isPopShouldStop hit， unlock queueLockManager
leizhiyuan Aug 29, 2024
484b332
fix: limit rate of appending commit in case of DLedger commit-log
lizhanhui Aug 30, 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 broker/src/main/java/org/apache/rocketmq/broker/processor/PopMessageProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,6 +540,7 @@ private CompletableFuture<Long> popMsgFromQueue(String topic, String attemptId,
return future;
}

future.whenComplete((result, throwable) -> queueLockManager.unLock(lockKey));
if (isPopShouldStop(topic, requestHeader.getConsumerGroup(), queueId)) {
POP_LOGGER.warn("Too much msgs unacked, then stop poping. topic={}, group={}, queueId={}", topic, requestHeader.getConsumerGroup(), queueId);
restNum = this.brokerController.getMessageStore().getMaxOffsetInQueue(topic, queueId) - offset + restNum;
Expand All @@ -548,7 +549,6 @@ private CompletableFuture<Long> popMsgFromQueue(String topic, String attemptId,
}

try {
future.whenComplete((result, throwable) -> queueLockManager.unLock(lockKey));
offset = getPopOffset(topic, requestHeader.getConsumerGroup(), queueId, requestHeader.getInitMode(),
true, lockKey, true);
if (isOrder && brokerController.getConsumerOrderInfoManager().checkBlock(attemptId, topic,
Expand Down
7 changes: 7 additions & 0 deletions store/src/test/java/org/apache/rocketmq/store/dledger/MessageStoreTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
*/
package org.apache.rocketmq.store.dledger;

import com.google.common.util.concurrent.RateLimiter;
import io.openmessaging.storage.dledger.DLedgerConfig;
import io.openmessaging.storage.dledger.DLedgerServer;
import java.io.File;
Expand Down Expand Up @@ -122,7 +123,13 @@ protected DefaultMessageStore createMessageStore(String base, boolean createAbor
}

protected void doPutMessages(MessageStore messageStore, String topic, int queueId, int num, long beginLogicsOffset) throws UnknownHostException {
RateLimiter rateLimiter = RateLimiter.create(100);
MessageStoreConfig storeConfig = messageStore.getMessageStoreConfig();
boolean limitAppendRate = storeConfig.isEnableDLegerCommitLog();
for (int i = 0; i < num; i++) {
if (limitAppendRate) {
rateLimiter.acquire();
}
MessageExtBrokerInner msgInner = buildMessage();
msgInner.setTopic(topic);
msgInner.setQueueId(queueId);
Expand Down
Loading