mvstates: fix oom issue when mining is enabled; (#40)

Co-authored-by: galaio <[email protected]>
bnb-chain · Oct 22, 2024 · 0aa6d95 · 0aa6d95
1 parent 7d375ff
commit 0aa6d95
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/core/blockchain.go b/core/blockchain.go
@@ -2701,7 +2701,7 @@ func (bc *BlockChain) HeaderChainForceSetHead(headNumber uint64) {
 }
 
 func (bc *BlockChain) TxDAGEnabledWhenMine() bool {
-	return bc.enableTxDAG && bc.txDAGReader == nil
+	return bc.enableTxDAG && bc.txDAGWriteCh == nil
 }
 
 func (bc *BlockChain) TxDAGFileOpened() bool {

diff --git a/core/state/statedb.go b/core/state/statedb.go
@@ -2388,6 +2388,9 @@ func (s *StateDB) ResetMVStates(txCount int) {
 	if s.isParallel && s.parallel.isSlotDB {
 		return
 	}
+	if s.mvStates != nil {
+		s.mvStates.Stop()
+	}
 	s.mvStates = types.NewMVStates(txCount).EnableAsyncDepGen()
 	s.rwSet = nil
 }

diff --git a/core/types/mvstates.go b/core/types/mvstates.go
@@ -336,11 +336,21 @@ func (s *MVStates) EnableAsyncDepGen() *MVStates {
 	return s
 }
 
+func (s *MVStates) Stop() error {
+	s.lock.Lock()
+	defer s.lock.Unlock()
+	s.stopAsyncDepGen()
+	return nil
+}
+
 func (s *MVStates) stopAsyncDepGen() {
+	if s.asyncRunning {
+		return
+	}
+	s.asyncRunning = false
 	if s.stopChan != nil {
 		close(s.stopChan)
 	}
-	s.asyncRunning = false
 }
 
 func (s *MVStates) asyncDepGenLoop() {

diff --git a/core/types/mvstates_test.go b/core/types/mvstates_test.go
@@ -87,6 +87,8 @@ func TestMVStates_AsyncDepGen_SimpleResolveTxDAG(t *testing.T) {
 
 	dag, err := ms.ResolveTxDAG(10, nil)
 	require.NoError(t, err)
+	time.Sleep(100 * time.Millisecond)
+	require.NoError(t, ms.Stop())
 	require.Equal(t, mockSimpleDAG(), dag)
 	t.Log(dag)
 }