From 94b7b6994e61552746446fdc248d30c1ea2060c6 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 18 Mar 2025 21:26:04 +0100 Subject: [PATCH] cmd/geth: clean up pruning command --- cmd/geth/chaincmd.go | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 9c5e532f21..05c8bc4c7c 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -647,25 +647,15 @@ func pruneHistory(ctx *cli.Context) error { return fmt.Errorf("merge block hash mismatch: got %s, want %s", hash.Hex(), mergeBlockHash) } - log.Info("Starting chain pruning", - "currentHeight", currentHeader.Number, - "mergeBlock", mergeBlock, - "mergeBlockHash", mergeBlockHash) - + log.Info("Starting history pruning", "head", currentHeader.Number, "tail", mergeBlock, "tailHash", mergeBlockHash) start := time.Now() - rawdb.PruneTransactionIndex(chaindb, mergeBlock) - - // TODO(s1na): what if there is a crash between the two prune operations? - - // Truncate everything up to merge block if _, err := chaindb.TruncateTail(mergeBlock); err != nil { return fmt.Errorf("failed to truncate ancient data: %v", err) } + log.Info("History pruning completed", "tail", mergeBlock, "elapsed", common.PrettyDuration(time.Since(start))) - log.Info("Chain pruning completed", - "prunedUpTo", mergeBlock, - "elapsed", common.PrettyDuration(time.Since(start))) + // TODO(s1na): what if there is a crash between the two prune operations? return nil }