Skip to content

[ISSUE #9640]Fix unexpected check even when transaction message retur… #9641

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

Closed
WJ66880 wants to merge 1 commit into from
+12 −12
Closed

[ISSUE #9640]Fix unexpected check even when transaction message retur… #9641

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions ...in/java/org/apache/rocketmq/broker/transaction/queue/TransactionalMessageServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ private boolean needDiscard(MessageExt msgExt, int transactionCheckMax) {
}

private boolean needSkip(MessageExt msgExt) {
long valueOfCurrentMinusBorn = System.currentTimeMillis() - msgExt.getBornTimestamp();
if (valueOfCurrentMinusBorn
long valueOfCurrentMinusStore = System.currentTimeMillis() - msgExt.getStoreTimestamp();
if (valueOfCurrentMinusStore
> transactionalMessageBridge.getBrokerController().getMessageStoreConfig().getFileReservedTime()
* 3600L * 1000) {
log.info("Half message exceed file reserved time ,so skip it.messageId {},bornTime {}",
msgExt.getMsgId(), msgExt.getBornTimestamp());
log.info("Half message exceed file reserved time ,so skip it.messageId {},storeTime {}",
msgExt.getMsgId(), msgExt.getStoreTimestamp());
return true;
}
return false;
Expand Down Expand Up @@ -272,29 +272,29 @@ public void check(long transactionTimeout, int transactionCheckMax,
break;
}

long valueOfCurrentMinusBorn = System.currentTimeMillis() - msgExt.getBornTimestamp();
long valueOfCurrentMinusStore = System.currentTimeMillis() - msgExt.getStoreTimestamp();
long checkImmunityTime = transactionTimeout;
String checkImmunityTimeStr = msgExt.getUserProperty(MessageConst.PROPERTY_CHECK_IMMUNITY_TIME_IN_SECONDS);
if (null != checkImmunityTimeStr) {
checkImmunityTime = getImmunityTime(checkImmunityTimeStr, transactionTimeout);
if (valueOfCurrentMinusBorn <= checkImmunityTime) {
if (valueOfCurrentMinusStore <= checkImmunityTime) {
if (checkPrepareQueueOffset(removeMap, doneOpOffset, msgExt, checkImmunityTimeStr)) {
newOffset = i + 1;
i++;
continue;
}
}
} else {
if (0 <= valueOfCurrentMinusBorn && valueOfCurrentMinusBorn <= checkImmunityTime) {
log.debug("New arrived, the miss offset={}, check it later checkImmunity={}, born={}", i,
checkImmunityTime, new Date(msgExt.getBornTimestamp()));
if (0 <= valueOfCurrentMinusStore && valueOfCurrentMinusStore <= checkImmunityTime) {
log.debug("New arrived, the miss offset={}, check it later checkImmunity={}, store={}", i,
checkImmunityTime, new Date(msgExt.getStoreTimestamp()));
break;
}
}
List<MessageExt> opMsg = pullResult == null ? null : pullResult.getMsgFoundList();
boolean isNeedCheck = opMsg == null && valueOfCurrentMinusBorn > checkImmunityTime
|| opMsg != null && opMsg.get(opMsg.size() - 1).getBornTimestamp() - startTime > transactionTimeout
|| valueOfCurrentMinusBorn <= -1;
boolean isNeedCheck = opMsg == null && valueOfCurrentMinusStore > checkImmunityTime
|| opMsg != null && opMsg.get(opMsg.size() - 1).getStoreTimestamp() - startTime > transactionTimeout
|| valueOfCurrentMinusStore <= -1;

if (isNeedCheck) {

Expand Down
Loading