fix

Change-Id: I97968a6b87d55c73ce871b3522c67b8b543d6eb2

Author: guyinyou

store/src/main/java/org/apache/rocketmq/store/config/MessageStoreConfig.java

@@ -81,7 +81,6 @@ public class MessageStoreConfig {
     private boolean timerInterceptDelayLevel = false;
     private int timerMaxDelaySec = 3600 * 24 * 3;
     private boolean timerWheelSnapshotFlush = false;
-    private boolean timerWheelDefaultFlush = true;
     private boolean timerWheelEnable = true;
 
     /**
@@ -1750,14 +1749,6 @@ public boolean isTimerWarmEnable() {
         return timerWarmEnable;
     }
 
-    public boolean isTimerWheelDefaultFlush() {
-        return timerWheelDefaultFlush;
-    }
-
-    public void setTimerWheelDefaultFlush(boolean timerWheelDefaultFlush) {
-        this.timerWheelDefaultFlush = timerWheelDefaultFlush;
-    }
-
     public boolean isTimerWheelSnapshotFlush() {
         return timerWheelSnapshotFlush;
     }

store/src/main/java/org/apache/rocketmq/store/timer/TimerMessageStore.java

@@ -179,9 +179,13 @@ public TimerMessageStore(final MessageStore messageStore, final MessageStoreConf
         long snapOffset = -1;
         if (storeConfig.isTimerWheelSnapshotFlush()) {
             snapOffset = TimerWheel.getMaxSnapshotFlag(timerWheelPath);
-            // correct recover offset
-            timerCheckpoint.setLastTimerLogFlushPos(snapOffset);
-            LOGGER.info("found timerWheel snapshot offset {}", snapOffset);
+            if (snapOffset > 0) {
+                // correct recover offset
+                timerCheckpoint.setLastTimerLogFlushPos(snapOffset);
+                LOGGER.info("found timerWheel snapshot offset {}", snapOffset);
+            } else {
+                LOGGER.info("not found timerWheel snapshot", snapOffset);
+            }
         }
         this.timerWheel = new TimerWheel(
             timerWheelPath, this.slotsTotal, precisionMs, snapOffset);
@@ -1836,15 +1840,12 @@ public void flush() throws IOException {
             synchronized (lockWhenFlush) {
                 prepareTimerCheckPoint();
                 timerLog.getMappedFileQueue().flush(0);
-                if (storeConfig.isTimerWheelDefaultFlush()) {
-                    timerWheel.flush();
+                if (System.currentTimeMillis() - lastSnapshotTime > storeConfig.getTimerWheelSnapshotIntervalMs()) {
+                    lastSnapshotTime = System.currentTimeMillis();
+                    timerWheel.backup(timerLog.getMappedFileQueue().getFlushedWhere());
+                    timerCheckpoint.flush();
                 }
             }
-            if (System.currentTimeMillis() - lastSnapshotTime > storeConfig.getTimerWheelSnapshotIntervalMs()) {
-                lastSnapshotTime = System.currentTimeMillis();
-                timerWheel.backup(timerLog.getMappedFileQueue().getFlushedWhere());
-                timerCheckpoint.flush();
-            }
             if (System.currentTimeMillis() - start > storeConfig.getTimerProgressLogIntervalMs()) {
                 start = System.currentTimeMillis();
                 long tmpQueueOffset = currQueueOffset;