fix merkle data racing bug

JimmyShi22 · Jan 18, 2024 · 3de96ac · 3de96ac
1 parent 1a059a2
commit 3de96ac
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/bcos-ledger/src/libledger/Ledger.cpp b/bcos-ledger/src/libledger/Ledger.cpp
@@ -1478,7 +1478,7 @@ static std::shared_ptr<std::vector<h256>> getMerkleTreeFromCache(int64_t blockNu
         else
         {
             merkleTree = merkleTreePtr.get();
-            LEDGER_LOG(DEBUG) << LOG_BADGE(cacheName) << LOG_DESC("Hit cache")
+            LEDGER_LOG(DEBUG) << LOG_BADGE(cacheName) << LOG_DESC("Hit ptr cache")
                               << LOG_KV("blockNumber", blockNumber);
         }
     }
@@ -1491,13 +1491,20 @@ static std::shared_ptr<std::vector<h256>> getMerkleTreeFromCache(int64_t blockNu
         merkle.template generateMerkle(hashesRange, *newMerkleTree);
         {
             RecursiveGuard l(mutex);
-            *merkleTree = std::move(*newMerkleTree);
+            if (!merkleTree->empty())
+            {
+                LEDGER_LOG(DEBUG) << LOG_BADGE(cacheName) << LOG_DESC("Hit cache")
+                                  << LOG_KV("blockNumber", blockNumber);
+            }
+            else
+            {
+                *merkleTree = std::move(*newMerkleTree);
+                LEDGER_LOG(DEBUG)
+                    << LOG_BADGE(cacheName)
+                    << LOG_DESC("Failed to hit the cache and build a new Merkel tree from scratch")
+                    << LOG_KV("blockNumber", blockNumber);
+            }
         }
-
-        LEDGER_LOG(DEBUG) << LOG_BADGE(cacheName)
-                          << LOG_DESC(
-                                 "Failed to hit the cache and build a new Merkel tree from scratch")
-                          << LOG_KV("blockNumber", blockNumber);
     }
 
     return merkleTree;