mirror/erigon-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/erigon-pulse.git synced 2025-01-08 20:11:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix close files error on win (#3572)

Browse Source
This commit is contained in:
Alex Sharov 2022-02-22 16:24:33 +07:00 committed by GitHub
parent b08cb44353
commit ab01d64916
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
turbo/snapshotsync/block_snapshots.go
View File

@ -134,7 +134,10 @@ func (s *RoSnapshots) IdxAvailability() (headers, bodies, txs uint64, err error)
return
}
func (s *RoSnapshots) ReopenIndices() error { return s.ReopenSomeIndices(AllSnapshotTypes...) }
func (s *RoSnapshots) ReopenIndices() error {
s.closeIndices()
return s.ReopenSomeIndices(AllSnapshotTypes...)
}
func (s *RoSnapshots) ReopenSomeIndices(types ...SnapshotType) (err error) {
for _, bs := range s.blocks {
@ -211,6 +214,8 @@ func (s *RoSnapshots) AsyncOpenAll(ctx context.Context) {
}
func (s *RoSnapshots) ReopenSegments() error {
s.closeSegements()
s.closeIndices()
s.blocks = nil
dir := s.dir
files, err := segmentsOfType(dir, Headers)
@ -297,24 +302,37 @@ func (s *RoSnapshots) ReopenSegments() error {
}
func (s *RoSnapshots) Close() {
s.closeSegements()
s.closeIndices()
s.blocks = nil
}
func (s *RoSnapshots) closeSegements() {
for _, s := range s.blocks {
if s.HeaderHashIdx != nil {
s.HeaderHashIdx.Close()
}
if s.Headers != nil {
s.Headers.Close()
}
if s.BodyNumberIdx != nil {
s.BodyNumberIdx.Close()
}
if s.Bodies != nil {
s.Bodies.Close()
}
if s.Transactions != nil {
s.Transactions.Close()
}
}
}
func (s *RoSnapshots) closeIndices() {
for _, s := range s.blocks {
if s.HeaderHashIdx != nil {
s.HeaderHashIdx.Close()
}
if s.BodyNumberIdx != nil {
s.BodyNumberIdx.Close()
}
if s.TxnHashIdx != nil {
s.TxnHashIdx.Close()
}
if s.Transactions != nil {
s.Transactions.Close()
if s.TxnHash2BlockNumIdx != nil {
s.TxnHash2BlockNumIdx.Close()
}
}
}

2
turbo/snapshotsync/block_snapshots_test.go
View File

@ -55,8 +55,6 @@ func createTestSegmentFile(t *testing.T, from, to uint64, name SnapshotType, dir
}
func TestMerge(t *testing.T) {
t.Skip("to close files on win")
dir, require := t.TempDir(), require.New(t)
createFile := func(from, to uint64) {
for _, snT := range AllSnapshotTypes {