You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rocketmq.apache.org by ji...@apache.org on 2022/09/14 02:04:13 UTC
[rocketmq] 01/01: Polish the put message result process in SendMessageProcessor and EndTransactionProcessor
This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch polish-putmessageresult-process
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
commit 3a3084352c0cfc619411379f50de32b0002b0672
Author: RongtongJin <ji...@mails.ucas.ac.cn>
AuthorDate: Wed Sep 14 10:03:29 2022 +0800
Polish the put message result process in SendMessageProcessor and EndTransactionProcessor
---
.../broker/processor/EndTransactionProcessor.java | 22 ++++++++++++++++++++++
.../broker/processor/SendMessageProcessor.java | 4 ++--
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/EndTransactionProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/EndTransactionProcessor.java
index 005f3060e..6da4a4a8a 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/processor/EndTransactionProcessor.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/EndTransactionProcessor.java
@@ -248,10 +248,32 @@ public class EndTransactionProcessor implements NettyRequestProcessor {
response.setCode(ResponseCode.SYSTEM_ERROR);
response.setRemark("OS page cache busy, please try another machine");
break;
+ case WHEEL_TIMER_MSG_ILLEGAL:
+ response.setCode(ResponseCode.MESSAGE_ILLEGAL);
+ response.setRemark(String.format("timer message illegal, the delay time should not be bigger than the max delay %dms; or if set del msg, the delay time should be bigger than the current time",
+ this.brokerController.getMessageStoreConfig().getTimerMaxDelaySec() * 1000));
+ break;
+ case WHEEL_TIMER_FLOW_CONTROL:
+ response.setCode(ResponseCode.SYSTEM_ERROR);
+ response.setRemark(String.format("timer message is under flow control, max num limit is %d or the current value is greater than %d and less than %d, trigger random flow control",
+ this.brokerController.getMessageStoreConfig().getTimerCongestNumEachSlot() * 2L, this.brokerController.getMessageStoreConfig().getTimerCongestNumEachSlot(), this.brokerController.getMessageStoreConfig().getTimerCongestNumEachSlot() * 2L));
+ break;
+ case WHEEL_TIMER_NOT_ENABLE:
+ response.setCode(ResponseCode.SYSTEM_ERROR);
+ response.setRemark(String.format("accurate timer message is not enabled, timerWheelEnable is %s",
+ this.brokerController.getMessageStoreConfig().isTimerWheelEnable()));
case UNKNOWN_ERROR:
response.setCode(ResponseCode.SYSTEM_ERROR);
response.setRemark("UNKNOWN_ERROR");
break;
+ case IN_SYNC_REPLICAS_NOT_ENOUGH:
+ response.setCode(ResponseCode.SYSTEM_ERROR);
+ response.setRemark("in-sync replicas not enough");
+ break;
+ case PUT_TO_REMOTE_BROKER_FAIL:
+ response.setCode(ResponseCode.SYSTEM_ERROR);
+ response.setRemark("put to remote broker fail");
+ break;
default:
response.setCode(ResponseCode.SYSTEM_ERROR);
response.setRemark("UNKNOWN_ERROR DEFAULT");
diff --git a/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java b/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java
index 3f15dbf1e..d36bef695 100644
--- a/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java
+++ b/broker/src/main/java/org/apache/rocketmq/broker/processor/SendMessageProcessor.java
@@ -358,12 +358,12 @@ public class SendMessageProcessor extends AbstractSendMessageProcessor implement
break;
case WHEEL_TIMER_FLOW_CONTROL:
response.setCode(ResponseCode.SYSTEM_ERROR);
- response.setRemark(String.format("send message too much, triggered the flow control max num limit is %d or the current value is greater than %d and less than %d, trigger random flow control",
+ response.setRemark(String.format("timer message is under flow control, max num limit is %d or the current value is greater than %d and less than %d, trigger random flow control",
this.brokerController.getMessageStoreConfig().getTimerCongestNumEachSlot() * 2L, this.brokerController.getMessageStoreConfig().getTimerCongestNumEachSlot(), this.brokerController.getMessageStoreConfig().getTimerCongestNumEachSlot() * 2L));
break;
case WHEEL_TIMER_NOT_ENABLE:
response.setCode(ResponseCode.SYSTEM_ERROR);
- response.setRemark(String.format("accurate delay is not enabled, timerWheelEnable is %s",
+ response.setRemark(String.format("accurate timer message is not enabled, timerWheelEnable is %s",
this.brokerController.getMessageStoreConfig().isTimerWheelEnable()));
case SERVICE_NOT_AVAILABLE:
response.setCode(ResponseCode.SERVICE_NOT_AVAILABLE);