lollipopjin commented on code in PR #9256:
URL: https://github.com/apache/rocketmq/pull/9256#discussion_r2053498500
##########
store/src/main/java/org/apache/rocketmq/store/dledger/DLedgerCommitLog.java:
##########
@@ -426,59 +426,42 @@ private void setRecoverPosition() {
log.info("Will set the initial commitlog offset={} for dledger",
dividedCommitlogOffset);
}
- private boolean isMmapFileMatchedRecover(final MmapFile mmapFile) throws
RocksDBException {
+ private boolean isMmapFileMatchedRecover(final MmapFile mmapFile, boolean
recoverNormally) throws RocksDBException {
ByteBuffer byteBuffer = mmapFile.sliceByteBuffer();
int magicCode = byteBuffer.getInt(DLedgerEntry.BODY_OFFSET +
MessageDecoder.MESSAGE_MAGIC_CODE_POSITION);
if (magicCode != MESSAGE_MAGIC_CODE) {
return false;
}
- if
(this.defaultMessageStore.getMessageStoreConfig().isEnableRocksDBStore()) {
- final long maxPhyOffsetInConsumeQueue =
this.defaultMessageStore.getQueueStore().getMaxPhyOffsetInConsumeQueue();
- long phyOffset = byteBuffer.getLong(DLedgerEntry.BODY_OFFSET +
MessageDecoder.MESSAGE_PHYSIC_OFFSET_POSITION);
- if (phyOffset <= maxPhyOffsetInConsumeQueue) {
- log.info("find check. beginPhyOffset: {},
maxPhyOffsetInConsumeQueue: {}", phyOffset, maxPhyOffsetInConsumeQueue);
- return true;
- }
+ int storeTimestampPosition;
+ int sysFlag = byteBuffer.getInt(DLedgerEntry.BODY_OFFSET +
MessageDecoder.SYSFLAG_POSITION);
+ if ((sysFlag & MessageSysFlag.BORNHOST_V6_FLAG) == 0) {
+ storeTimestampPosition =
MessageDecoder.MESSAGE_STORE_TIMESTAMP_POSITION;
} else {
- int storeTimestampPosition;
- int sysFlag = byteBuffer.getInt(DLedgerEntry.BODY_OFFSET +
MessageDecoder.SYSFLAG_POSITION);
- if ((sysFlag & MessageSysFlag.BORNHOST_V6_FLAG) == 0) {
- storeTimestampPosition =
MessageDecoder.MESSAGE_STORE_TIMESTAMP_POSITION;
- } else {
- // v6 address is 12 byte larger than v4
- storeTimestampPosition =
MessageDecoder.MESSAGE_STORE_TIMESTAMP_POSITION + 12;
- }
+ // v6 address is 12 byte larger than v4
+ storeTimestampPosition =
MessageDecoder.MESSAGE_STORE_TIMESTAMP_POSITION + 12;
+ }
- long storeTimestamp = byteBuffer.getLong(DLedgerEntry.BODY_OFFSET
+ storeTimestampPosition);
- if (storeTimestamp == 0) {
- return false;
- }
+ long storeTimestamp = byteBuffer.getLong(DLedgerEntry.BODY_OFFSET +
storeTimestampPosition);
+ if (storeTimestamp == 0) {
+ return false;
+ }
- if
(this.defaultMessageStore.getMessageStoreConfig().isMessageIndexEnable()
- &&
this.defaultMessageStore.getMessageStoreConfig().isMessageIndexSafe()) {
- if (storeTimestamp <=
this.defaultMessageStore.getStoreCheckpoint().getMinTimestampIndex()) {
- log.info("dledger find check timestamp, {} {}",
- storeTimestamp,
- UtilAll.timeMillisToHumanString(storeTimestamp));
- return true;
- }
- } else {
- if (storeTimestamp <=
this.defaultMessageStore.getStoreCheckpoint().getMinTimestamp()) {
- log.info("dledger find check timestamp, {} {}",
- storeTimestamp,
- UtilAll.timeMillisToHumanString(storeTimestamp));
- return true;
- }
+ if
(this.defaultMessageStore.getMessageStoreConfig().isMessageIndexEnable()
+ &&
this.defaultMessageStore.getMessageStoreConfig().isMessageIndexSafe()) {
+ if (storeTimestamp >
this.defaultMessageStore.getStoreCheckpoint().getIndexMsgTimestamp()) {
+ return false;
Review Comment:
Add log here for more information in 'false' return.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscr...@rocketmq.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
