fix: fix pbss async node buffer force flush buffer

bnb-chain · Feb 10, 2025 · 705d4ab · 705d4ab
1 parent afe4ba0
commit 705d4ab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/triedb/pathdb/asyncnodebuffer.go b/triedb/pathdb/asyncnodebuffer.go
@@ -119,7 +119,7 @@ func (a *asyncnodebuffer) flush(db ethdb.KeyValueStore, freezer ethdb.AncientWri
 
 	if force {
 		for {
-			if atomic.LoadUint64(&a.background.immutable) == 1 {
+			if atomic.LoadUint64(&a.background.immutable) == 1 || atomic.LoadUint64(&a.current.immutable) == 1 {
 				time.Sleep(time.Duration(DefaultBackgroundFlushInterval) * time.Second)
 				log.Info("Waiting background memory table flushed into disk for forcing flush node buffer")
 				continue

diff --git a/triedb/pathdb/database_test.go b/triedb/pathdb/database_test.go
@@ -450,6 +450,10 @@ func TestDatabaseRollback(t *testing.T) {
 
 	// Verify state histories
 	tester := newTester(t, 0, false, 32)
+	bottom := tester.db.tree.bottom()
+	if err := bottom.buffer.flush(tester.db.diskdb, tester.db.freezer, bottom.nodes, bottom.id, true); err != nil {
+		t.Fatalf("Failed to force flush: %v", err)
+	}
 	defer tester.release()
 
 	if err := tester.verifyHistory(); err != nil {
@@ -520,17 +524,18 @@ func TestDatabaseRecoverable(t *testing.T) {
 	}
 }
 
-// TODO(joey): fail when using asyncbuffer
-//
-//nolint:unused
-func testDisable(t *testing.T) {
+func TestDisable(t *testing.T) {
 	// Redefine the diff layer depth allowance for faster testing.
 	maxDiffLayers = 4
 	defer func() {
 		maxDiffLayers = 128
 	}()
 
 	tester := newTester(t, 0, false, 32)
+	bottom := tester.db.tree.bottom()
+	if err := bottom.buffer.flush(tester.db.diskdb, tester.db.freezer, nil, bottom.id, true); err != nil {
+		t.Fatalf("Failed to force flush: %v", err)
+	}
 	defer tester.release()
 
 	stored := crypto.Keccak256Hash(rawdb.ReadAccountTrieNode(tester.db.diskdb, nil))