cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
pull from: v1.11.6-statediff-v5
merge into: cerc-io:master
Conversation 0 Commits 1565 Files Changed 1471 +8 -5
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e04d63ebd3 - Show all commits

4
core/rawdb/chain_freezer.go
View File

@ -86,14 +86,14 @@ func (f *chainFreezer) Close() error {
// This functionality is deliberately broken off from block importing to avoid // This functionality is deliberately broken off from block importing to avoid
// incurring additional data shuffling delays on block propagation. // incurring additional data shuffling delays on block propagation.
func (f *chainFreezer) freeze(db ethdb.KeyValueStore) { func (f *chainFreezer) freeze(db ethdb.KeyValueStore) {
nfdb := &nofreezedb{KeyValueStore: db}
var ( var (
backoff bool backoff bool
triggered chan struct{} // Used in tests triggered chan struct{} // Used in tests
nfdb = &nofreezedb{KeyValueStore: db}
) )
timer := time.NewTimer(freezerRecheckInterval) timer := time.NewTimer(freezerRecheckInterval)
defer timer.Stop() defer timer.Stop()
for { for {
select { select {
case <-f.quit: case <-f.quit:

7
core/rawdb/freezer_table.go
View File

@ -852,8 +852,11 @@ func (t *freezerTable) advanceHead() error {
if err != nil { if err != nil {
return err return err
} }
// Commit the contents of the old file to stable storage and
// Close old file, and reopen in RDONLY mode. // tear it down. It will be re-opened in read-only mode.
if err := t.head.Sync(); err != nil {
return err
}
t.releaseFile(t.headId) t.releaseFile(t.headId)
t.openFile(t.headId, openFreezerFileForReadOnly) t.openFile(t.headId, openFreezerFileForReadOnly)

2
core/rawdb/freezer_test.go
View File

@ -190,7 +190,7 @@ func TestFreezerConcurrentModifyTruncate(t *testing.T) {
var item = make([]byte, 256) var item = make([]byte, 256)
for i := 0; i < 1000; i++ { for i := 0; i < 10; i++ {
// First reset and write 100 items. // First reset and write 100 items.
if err := f.TruncateHead(0); err != nil { if err := f.TruncateHead(0); err != nil {
t.Fatal("truncate failed:", err) t.Fatal("truncate failed:", err)