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 ConsumeMessageOrderlyService enumerated types of comparison #7408

Closed
wants to merge 2 commits into from
Closed

Optimize ConsumeMessageOrderlyService enumerated types of comparison #7408

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73908f3
Update ConsumeMessageOrderlyService.java
fqgsoftwareengineer Sep 27, 2023
2334e99
Update ConsumeMessageOrderlyService.java
fqgsoftwareengineer Oct 16, 2023
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
10 changes: 5 additions & 5 deletions .../src/main/java/org/apache/rocketmq/client/impl/consumer/ConsumeMessageOrderlyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public ConsumeMessageOrderlyService(DefaultMQPushConsumerImpl defaultMQPushConsu
}

public void start() {
if (MessageModel.CLUSTERING.equals(ConsumeMessageOrderlyService.this.defaultMQPushConsumerImpl.messageModel())) {
if (MessageModel.CLUSTERING == ConsumeMessageOrderlyService.this.defaultMQPushConsumerImpl.messageModel()) {
this.scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
@Override
public void run() {
Expand All @@ -104,7 +104,7 @@ public void shutdown(long awaitTerminateMillis) {
this.stopped = true;
this.scheduledExecutorService.shutdown();
ThreadUtils.shutdownGracefully(this.consumeExecutor, awaitTerminateMillis, TimeUnit.MILLISECONDS);
if (MessageModel.CLUSTERING.equals(this.defaultMQPushConsumerImpl.messageModel())) {
if (MessageModel.CLUSTERING == this.defaultMQPushConsumerImpl.messageModel()) {
this.unlockAllMQ();
}
}
Expand Down Expand Up @@ -431,7 +431,7 @@ public void run() {

final Object objLock = messageQueueLock.fetchLockObject(this.messageQueue);
synchronized (objLock) {
if (MessageModel.BROADCASTING.equals(ConsumeMessageOrderlyService.this.defaultMQPushConsumerImpl.messageModel())
if (MessageModel.BROADCASTING == ConsumeMessageOrderlyService.this.defaultMQPushConsumerImpl.messageModel()
|| this.processQueue.isLocked() && !this.processQueue.isLockExpired()) {
final long beginTime = System.currentTimeMillis();
for (boolean continueConsume = true; continueConsume; ) {
Expand All @@ -440,14 +440,14 @@ public void run() {
break;
}

if (MessageModel.CLUSTERING.equals(ConsumeMessageOrderlyService.this.defaultMQPushConsumerImpl.messageModel())
if (MessageModel.CLUSTERING == ConsumeMessageOrderlyService.this.defaultMQPushConsumerImpl.messageModel()
&& !this.processQueue.isLocked()) {
log.warn("the message queue not locked, so consume later, {}", this.messageQueue);
ConsumeMessageOrderlyService.this.tryLockLaterAndReconsume(this.messageQueue, this.processQueue, 10);
break;
}

if (MessageModel.CLUSTERING.equals(ConsumeMessageOrderlyService.this.defaultMQPushConsumerImpl.messageModel())
if (MessageModel.CLUSTERING == ConsumeMessageOrderlyService.this.defaultMQPushConsumerImpl.messageModel()
&& this.processQueue.isLockExpired()) {
log.warn("the message queue lock expired, so consume later, {}", this.messageQueue);
ConsumeMessageOrderlyService.this.tryLockLaterAndReconsume(this.messageQueue, this.processQueue, 10);
Expand Down
Loading