bug fix: clear future cache when view change && modify cache of block…

… number before go out of the lock when access commitBlock
FISCO-BCOS · Mar 5, 2019 · 8ec5f0c · 8ec5f0c
1 parent 869585e
commit 8ec5f0c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/libblockchain/BlockChainImp.cpp b/libblockchain/BlockChainImp.cpp
@@ -879,14 +879,12 @@ CommitResult BlockChainImp::commitBlock(Block& block, std::shared_ptr<ExecutiveC
             writeTotalTransactionCount(block, context);
             writeTxToBlock(block, context);
             context->dbCommit(block);
+            {
+                WriteGuard ll(m_blockNumberMutex);
+                m_blockNumber = block.blockHeader().number();
+            }
         }
         m_blockCache.add(block);
-
-        {
-            WriteGuard ll(m_blockNumberMutex);
-            m_blockNumber = block.blockHeader().number();
-        }
-
         m_onReady(m_blockNumber);
         return CommitResult::OK;
     }

diff --git a/libconsensus/pbft/PBFTEngine.cpp b/libconsensus/pbft/PBFTEngine.cpp
@@ -1451,7 +1451,8 @@ void PBFTEngine::getAllNodesViewStatus(json_spirit::Array& status)
         dev::network::NodeID node_id = getSealerByIndex(it.first);
         if (node_id != dev::network::NodeID())
         {
-            view_obj.push_back(json_spirit::Pair("0x" + dev::toHex(node_id), it.second));
+            view_obj.push_back(json_spirit::Pair("nodeId", dev::toHex(node_id)));
+            view_obj.push_back(json_spirit::Pair("view", it.second));
             view_array.push_back(view_obj);
         }
     }

diff --git a/libconsensus/pbft/PBFTReqCache.h b/libconsensus/pbft/PBFTReqCache.h
@@ -199,6 +199,7 @@ class PBFTReqCache : public std::enable_shared_from_this<PBFTReqCache>
         m_prepareCache.clear();
         m_signCache.clear();
         m_commitCache.clear();
+        m_futurePrepareCache.clear();
         removeInvalidViewChange(curView);
     }
     /// delete requests cached in m_signCache, m_commitCache and m_prepareCache according to hash