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 #435] Support Consumer Shutdown "awaitTerminationMillisWhenShutdown" #435

Merged
merged 2 commits into from
Mar 5, 2022
Merged

[ISSUE #435] Support Consumer Shutdown "awaitTerminationMillisWhenShutdown" #435

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
a3d82e3
feature:Support Consumer Shutdown "awaitTerminationMillisWhenShutdown"
Mar 4, 2022
16b71e4
revert
Mar 4, 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
6 changes: 6 additions & 0 deletions ...ing-boot/src/main/java/org/apache/rocketmq/spring/annotation/RocketMQMessageListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,10 @@
* The minimum value is 10 and the maximum is 30000.
*/
int suspendCurrentQueueTimeMillis() default 1000;

/**
* Maximum time to await message consuming when shutdown consumer, in milliseconds.
* The minimum value is 0
*/
int awaitTerminationMillisWhenShutdown() default 1000;
}
12 changes: 12 additions & 0 deletions ...ot/src/main/java/org/apache/rocketmq/spring/support/DefaultRocketMQListenerContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ public class DefaultRocketMQListenerContainer implements InitializingBean,
private int replyTimeout;
private String tlsEnable;
private String namespace;
private long awaitTerminationMillisWhenShutdown;

public long getSuspendCurrentQueueTimeMillis() {
return suspendCurrentQueueTimeMillis;
Expand Down Expand Up @@ -245,6 +246,7 @@ public void setRocketMQMessageListener(RocketMQMessageListener anno) {
this.namespace = anno.namespace();
this.delayLevelWhenNextConsume = anno.delayLevelWhenNextConsume();
this.suspendCurrentQueueTimeMillis = anno.suspendCurrentQueueTimeMillis();
this.awaitTerminationMillisWhenShutdown = Math.max(0, anno.awaitTerminationMillisWhenShutdown());
}

public ConsumeMode getConsumeMode() {
Expand Down Expand Up @@ -291,6 +293,15 @@ public void setConsumer(DefaultMQPushConsumer consumer) {
this.consumer = consumer;
}

public long getAwaitTerminationMillisWhenShutdown() {
return awaitTerminationMillisWhenShutdown;
}

public DefaultRocketMQListenerContainer setAwaitTerminationMillisWhenShutdown(long awaitTerminationMillisWhenShutdown) {
this.awaitTerminationMillisWhenShutdown = awaitTerminationMillisWhenShutdown;
return this;
}

@Override
public void destroy() {
this.setRunning(false);
Expand Down Expand Up @@ -624,6 +635,7 @@ private void initRocketMQPushConsumer() throws MQClientException {
consumer.setConsumeThreadMin(consumeThreadNumber);
consumer.setConsumeTimeout(consumeTimeout);
consumer.setMaxReconsumeTimes(maxReconsumeTimes);
consumer.setAwaitTerminationMillisWhenShutdown(awaitTerminationMillisWhenShutdown);
switch (messageModel) {
case BROADCASTING:
consumer.setMessageModel(org.apache.rocketmq.common.protocol.heartbeat.MessageModel.BROADCASTING);
Expand Down