cover new epoch tick-jumping case

Author: krypdkat

bob.cpp

@@ -164,11 +164,6 @@ int runBob(int argc, char *argv[])
     uint32_t endEpochTick = 0;
     std::string key = "end_epoch_tick:" + std::to_string(gCurrentProcessingEpoch);
     bool isThisEpochAlreadyEnd = db_get_u32(key, endEpochTick);
-    bool needInitialClean = true;
-    if (isThisEpochAlreadyEnd)
-    {
-        needInitialClean = false; // expecting a big jump in tick
-    }
     int retryCount = 0;
     while ((initTick == 0 ||
             ( (initEpoch < gCurrentProcessingEpoch && !isThisEpochAlreadyEnd) ||
@@ -235,7 +230,7 @@ int runBob(int argc, char *argv[])
         Logger::get()->critical("Illegal DB status: gCurrentFetchingTick < gCurrentVerifyLoggingTick");
         exit(2);
     }
-    if (needInitialClean) initialCleanDB();
+    initialCleanDB();
 
     auto request_thread = std::thread(
             [&](){

database/garbageCleaner.cpp

@@ -228,22 +228,24 @@ void initialCleanDB() // to clean up in case crashing last time
     long long lastCleanTickData;
     long long lastCleanTransactionTick;
 
-    if (db_get_u32(KEY_LAST_CLEAN_TICK_DATA, loadedCleanTickData) && loadedCleanTickData > 0)
+    db_get_u32(KEY_LAST_CLEAN_TICK_DATA, loadedCleanTickData);
+    if (loadedCleanTickData > 0 && loadedCleanTickData > gInitialTick - 1)
     {
         lastCleanTickData = loadedCleanTickData;
     }
     else
     {
-        lastCleanTickData = gInitialTick;
+        lastCleanTickData = gInitialTick - 1;
     }
 
-    if (db_get_u32(KEY_LAST_CLEAN_TX_TICK, loadedCleanTxTick) && loadedCleanTxTick > 0)
+    db_get_u32(KEY_LAST_CLEAN_TX_TICK, loadedCleanTxTick);
+    if (loadedCleanTxTick > 0 && loadedCleanTxTick > gInitialTick - 1)
     {
         lastCleanTransactionTick = loadedCleanTxTick;
     }
     else
     {
-        lastCleanTransactionTick = gInitialTick;
+        lastCleanTransactionTick = gInitialTick - 1;
     }
 
     uint32_t lastReportedTick = 0;
@@ -264,8 +266,8 @@ void garbageCleaner()
     uint32_t loadedCleanTxTick = 0;
     gLastCleanTickData = 0;
     gLastCleanTransactionTick = 0;
-
-    if (db_get_u32(KEY_LAST_CLEAN_TICK_DATA, loadedCleanTickData) && loadedCleanTickData > 0)
+    db_get_u32(KEY_LAST_CLEAN_TICK_DATA, loadedCleanTickData);
+    if (loadedCleanTickData > 0 && loadedCleanTickData > gInitialTick - 1)
     {
         gLastCleanTickData = loadedCleanTickData;
         Logger::get()->info("Loaded lastCleanTickData from DB: {}", gLastCleanTickData);
@@ -276,7 +278,8 @@ void garbageCleaner()
         Logger::get()->info("No persisted lastCleanTickData found, using default: {}", gLastCleanTickData);
     }
 
-    if (db_get_u32(KEY_LAST_CLEAN_TX_TICK, loadedCleanTxTick) && loadedCleanTxTick > 0)
+    db_get_u32(KEY_LAST_CLEAN_TX_TICK, loadedCleanTxTick);
+    if (loadedCleanTxTick > 0 && loadedCleanTxTick > gInitialTick - 1)
     {
         gLastCleanTransactionTick = loadedCleanTxTick;
         Logger::get()->info("Loaded gLastCleanTransactionTick from DB: {}", gLastCleanTransactionTick);