Merge pull request qunarcorp#20 from Dennis8274/fix_delay_message_rep…

…layer fix delay message replayer
pkuLeslie · Dec 27, 2018 · 7cd5dde · 7cd5dde
2 parents 92c4015 + 2c41192
commit 7cd5dde
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/qmq-delay-server/src/main/java/qunar/tc/qmq/delay/MessageLogReplayer.java b/qmq-delay-server/src/main/java/qunar/tc/qmq/delay/MessageLogReplayer.java
@@ -117,7 +117,6 @@ private void processLog(long cursor) {
                 if (LOG_LIMITER.tryAcquire()) {
                     LOGGER.info("replay message log failed,cursor < iterate,cursor:{},iterate:{}", cursor, iterate);
                 }
-                if ((iterate % PER_SEGMENT_FILE_SIZE) != 0) throw new RuntimeException("MessageReplayLessThanEx");
                 this.cursor.set(iterate);
             }
 

diff --git a/qmq-delay-server/src/main/java/qunar/tc/qmq/delay/store/visitor/DelayMessageLogVisitor.java b/qmq-delay-server/src/main/java/qunar/tc/qmq/delay/store/visitor/DelayMessageLogVisitor.java
@@ -104,7 +104,7 @@ private Optional<LogRecord> readOneRecord(final ByteBuffer buffer) {
         // magic
         final int magic = buffer.getInt();
         if (!MagicCodeSupport.isValidMessageLogMagicCode(magic)) {
-//            visitedBufferSize.set(currentBuffer.getSize());
+            visitedBufferSize.set(currentBuffer.getSize());
             return Optional.of(EMPTY_LOG_RECORD);
         }