Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

core/rawdb: fix cornercase shutdown behaviour in freezer #26485

Merged
merged 8 commits into from
Jan 16, 2023
Merged

core/rawdb: fix cornercase shutdown behaviour in freezer #26485

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f39e8df
core/rawdb: debug print exact numbers without prettification
holiman Jan 12, 2023
ebe49f4
core/rawdb: handle sync after close
holiman Jan 12, 2023
3806472
core/rawdb: fix testcase, fix closed-check
holiman Jan 13, 2023
afd2457
core/rawdb: more verbosity after repair truncates items
holiman Jan 13, 2023
63f7fba
cmd/geth: simplify freezer-inspect
holiman Jan 13, 2023
40ede55
core/rawdb: fsync when closing freezer files
holiman Jan 13, 2023
33b075c
core/rawdb: avoid sync on readonly files
holiman Jan 13, 2023
743d702
core/rawdb: fixes re syncing files
holiman Jan 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
cmd/geth: simplify freezer-inspect
  • Loading branch information
@holiman
holiman committed Jan 13, 2023
commit 63f7fbaf28a1215f091489177427077fc3d8fc41
12 changes: 2 additions & 10 deletions cmd/geth/dbcmd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,16 +551,8 @@ func freezerInspect(ctx *cli.Context) error {
return err
}
stack, _ := makeConfigNode(ctx)
defer stack.Close()

db := utils.MakeChainDatabase(ctx, stack, true)
defer db.Close()

ancient, err := db.AncientDatadir()
if err != nil {
log.Info("Failed to retrieve ancient root", "err", err)
return err
}
ancient := stack.ResolveAncient("chaindata", ctx.String(utils.AncientFlag.Name))
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any particular reason for this change? Directly resolve ancient datadir without involving the chain DB?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, for the investigation here: #26483 (comment) , I needed to do a geth db inspect, but I didn't actually have a leveldb -- I only had a couple of index files.

This whole utils.MakeChainDatabase assumes things to be pretty well ordered, but all we use it for eventually is to help resolve the ancientdir, via db.AncientDir.

So this change has the same effect as the original code, but is more robust in case the data is not fully consistent / present.

stack.Close()
return rawdb.InspectFreezerTable(ancient, freezer, table, start, end)
}

Expand Down
3 changes: 2 additions & 1 deletion core/rawdb/freezer_table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -908,7 +908,8 @@ func (t *freezerTable) dumpIndex(w io.Writer, start, stop int64) {
fmt.Fprintf(w, "Failed to decode freezer table %v\n", err)
return
}
fmt.Fprintf(w, "Version %d deleted %d, hidden %d\n", meta.Version, atomic.LoadUint64(&t.itemOffset), atomic.LoadUint64(&t.itemHidden))
fmt.Fprintf(w, "Version %d count %d, deleted %d, hidden %d\n", meta.Version,
atomic.LoadUint64(&t.items), atomic.LoadUint64(&t.itemOffset), atomic.LoadUint64(&t.itemHidden))

buf := make([]byte, indexEntrySize)

Expand Down