core: truncatetail missing f.offset

Signed-off-by: Delweng <delweng@gmail.com>
jsvisa · Feb 20, 2023 · 7e51a8b · 7e51a8b
1 parent 056ef2e
commit 7e51a8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/core/rawdb/freezer.go b/core/rawdb/freezer.go
@@ -330,7 +330,7 @@ func (f *freezer) TruncateHead(items uint64) error {
 		return nil
 	}
 	for _, table := range f.tables {
-		if err := table.truncateHead(items); err != nil {
+		if err := table.truncateHead(items - f.offset); err != nil {
 			return err
 		}
 	}

diff --git a/core/state/pruner/pruner.go b/core/state/pruner/pruner.go
@@ -401,7 +401,7 @@ func (p *BlockPruner) backupOldDb(name string, cache, handles int, namespace str
 	// For every round, newoffset actually equals to the startBlockNumber in ancient backup db.
 	frdbBack, err := rawdb.NewFreezerDb(chainDb, p.newAncientPath, namespace, readonly, startBlockNumber)
 	if err != nil {
-		log.Error("Failed to create ancient freezer backup", "err=", err)
+		log.Error("Failed to create ancient freezer backup", "err", err)
 		return err
 	}
 	defer frdbBack.Close()
@@ -438,7 +438,7 @@ func (p *BlockPruner) backupOldDb(name string, cache, handles int, namespace str
 		}
 		// Write into new ancient_back db.
 		if _, err := rawdb.WriteAncientBlocks(frdbBack, []*types.Block{block}, []types.Receipts{receipts}, []types.Receipts{borReceipts}, td); err != nil {
-			log.Error("failed to write new ancient", "error", err)
+			log.Error("failed to write new ancient", "err", err)
 			return err
 		}
 		// Print the log every 5s for better trace.