vongosling closed pull request #548: [ISSUE #544]Fixed Transactional message
will be lost under extreme condition
URL: https://github.com/apache/rocketmq/pull/548
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
index 15e5c84ff..1c227af15 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
@@ -198,7 +198,7 @@ public void check(long transactionTimeout, int
transactionCheckMax,
if (null != checkImmunityTimeStr) {
checkImmunityTime =
getImmunityTime(checkImmunityTimeStr, transactionTimeout);
if (valueOfCurrentMinusBorn < checkImmunityTime) {
- if (checkPrepareQueueOffset(removeMap,
doneOpOffset, msgExt, checkImmunityTime)) {
+ if (checkPrepareQueueOffset(removeMap,
doneOpOffset, msgExt)) {
newOffset = i + 1;
i++;
continue;
@@ -315,33 +315,26 @@ private PullResult fillOpRemoveMap(HashMap<Long, Long>
removeMap,
* @param removeMap Op message map to determine whether a half message was
responded by producer.
* @param doneOpOffset Op Message which has been checked.
* @param msgExt Half message
- * @param checkImmunityTime User defined time to avoid being detected
early.
* @return Return true if put success, otherwise return false.
*/
- private boolean checkPrepareQueueOffset(HashMap<Long, Long> removeMap,
List<Long> doneOpOffset, MessageExt msgExt,
- long checkImmunityTime) {
- if (System.currentTimeMillis() - msgExt.getBornTimestamp() <
checkImmunityTime) {
- String prepareQueueOffsetStr =
msgExt.getUserProperty(MessageConst.PROPERTY_TRANSACTION_PREPARED_QUEUE_OFFSET);
- if (null == prepareQueueOffsetStr) {
- return putImmunityMsgBackToHalfQueue(msgExt);
+ private boolean checkPrepareQueueOffset(HashMap<Long, Long> removeMap,
List<Long> doneOpOffset,
+ MessageExt msgExt) {
+ String prepareQueueOffsetStr =
msgExt.getUserProperty(MessageConst.PROPERTY_TRANSACTION_PREPARED_QUEUE_OFFSET);
+ if (null == prepareQueueOffsetStr) {
+ return putImmunityMsgBackToHalfQueue(msgExt);
+ } else {
+ long prepareQueueOffset = getLong(prepareQueueOffsetStr);
+ if (-1 == prepareQueueOffset) {
+ return false;
} else {
- long prepareQueueOffset = getLong(prepareQueueOffsetStr);
- if (-1 == prepareQueueOffset) {
- return false;
+ if (removeMap.containsKey(prepareQueueOffset)) {
+ long tmpOpOffset = removeMap.remove(prepareQueueOffset);
+ doneOpOffset.add(tmpOpOffset);
+ return true;
} else {
- if (removeMap.containsKey(prepareQueueOffset)) {
- long tmpOpOffset =
removeMap.remove(prepareQueueOffset);
- doneOpOffset.add(tmpOpOffset);
- return true;
- } else {
- return putImmunityMsgBackToHalfQueue(msgExt);
- }
+ return putImmunityMsgBackToHalfQueue(msgExt);
}
-
}
-
- } else {
- return true;
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
