Revert "log file unmap/close errors (ledgerwatch#1036)"

This reverts commit dc1d96d.
pratikspatil024 · Aug 18, 2023 · 6135ed9 · 6135ed9
1 parent c787d61
commit 6135ed9
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 51 deletions.
diff --git a/common/dbg/leak_detector.go b/common/dbg/leak_detector.go
@@ -10,8 +10,6 @@ import (
 	"github.com/ledgerwatch/log/v3"
 )
 
-const FileCloseLogLevel = log.LvlTrace
-
 // LeakDetector - use it to find which resource was created but not closed (leaked)
 // periodically does print in logs resources which living longer than 1min with their creation stack trace
 // For example db transactions can call Add/Del from Begin/Commit/Rollback methods

diff --git a/compress/decompress.go b/compress/decompress.go
@@ -341,16 +341,14 @@ func (d *Decompressor) ModTime() time.Time {
 	return d.modTime
 }
 
-func (d *Decompressor) Close() {
-	if d.f != nil {
-		if err := mmap.Munmap(d.mmapHandle1, d.mmapHandle2); err != nil {
-			log.Log(dbg.FileCloseLogLevel, "unmap", "err", err, "file", d.FileName(), "stack", dbg.Stack())
-		}
-		if err := d.f.Close(); err != nil {
-			log.Log(dbg.FileCloseLogLevel, "close", "err", err, "file", d.FileName(), "stack", dbg.Stack())
-		}
-		d.f = nil
+func (d *Decompressor) Close() error {
+	if err := mmap.Munmap(d.mmapHandle1, d.mmapHandle2); err != nil {
+		log.Trace("unmap", "err", err, "file", d.FileName())
 	}
+	if err := d.f.Close(); err != nil {
+		return err
+	}
+	return nil
 }
 
 func (d *Decompressor) FilePath() string { return d.filePath }

diff --git a/kv/bitmapdb/fixed_size.go b/kv/bitmapdb/fixed_size.go
@@ -80,19 +80,18 @@ func OpenFixedSizeBitmaps(filePath string, bitsPerBitmap int) (*FixedSizeBitmaps
 
 func (bm *FixedSizeBitmaps) FileName() string { return bm.fileName }
 func (bm *FixedSizeBitmaps) FilePath() string { return bm.filePath }
-func (bm *FixedSizeBitmaps) Close() {
+func (bm *FixedSizeBitmaps) Close() error {
 	if bm.m != nil {
 		if err := bm.m.Unmap(); err != nil {
 			log.Trace("unmap", "err", err, "file", bm.FileName())
 		}
-		bm.m = nil
 	}
 	if bm.f != nil {
 		if err := bm.f.Close(); err != nil {
-			log.Trace("close", "err", err, "file", bm.FileName())
+			return err
 		}
-		bm.f = nil
 	}
+	return nil
 }
 
 func (bm *FixedSizeBitmaps) At(item uint64) (res []uint64, err error) {
@@ -220,18 +219,8 @@ func NewFixedSizeBitmapsWriter(indexFile string, bitsPerBitmap int, amount uint6
 	return idx, nil
 }
 func (w *FixedSizeBitmapsWriter) Close() {
-	if w.m != nil {
-		if err := w.m.Unmap(); err != nil {
-			log.Trace("unmap", "err", err, "file", w.f.Name())
-		}
-		w.m = nil
-	}
-	if w.f != nil {
-		if err := w.f.Close(); err != nil {
-			log.Trace("close", "err", err, "file", w.f.Name())
-		}
-		w.f = nil
-	}
+	_ = w.m.Unmap()
+	_ = w.f.Close()
 }
 func growFileToSize(f *os.File, size int) error {
 	pageSize := os.Getpagesize()

diff --git a/recsplit/index.go b/recsplit/index.go
@@ -28,7 +28,6 @@ import (
 	"time"
 	"unsafe"
 
-	"github.com/ledgerwatch/erigon-lib/common/dbg"
 	"github.com/ledgerwatch/log/v3"
 
 	"github.com/ledgerwatch/erigon-lib/common"
@@ -175,19 +174,17 @@ func (idx *Index) BaseDataID() uint64 { return idx.baseDataID }
 func (idx *Index) FilePath() string   { return idx.filePath }
 func (idx *Index) FileName() string   { return idx.fileName }
 
-func (idx *Index) Close() {
+func (idx *Index) Close() error {
 	if idx == nil {
-		return
+		return nil
 	}
-	if idx.f != nil {
-		if err := mmap.Munmap(idx.mmapHandle1, idx.mmapHandle2); err != nil {
-			log.Log(dbg.FileCloseLogLevel, "unmap", "err", err, "file", idx.FileName(), "stack", dbg.Stack())
-		}
-		if err := idx.f.Close(); err != nil {
-			log.Log(dbg.FileCloseLogLevel, "close", "err", err, "file", idx.FileName(), "stack", dbg.Stack())
-		}
-		idx.f = nil
+	if err := mmap.Munmap(idx.mmapHandle1, idx.mmapHandle2); err != nil {
+		log.Trace("unmap", "err", err, "file", idx.FileName())
 	}
+	if err := idx.f.Close(); err != nil {
+		return err
+	}
+	return nil
 }
 
 func (idx *Index) skipBits(m uint16) int {

diff --git a/state/btree_index.go b/state/btree_index.go
@@ -16,7 +16,6 @@ import (
 
 	"github.com/c2h5oh/datasize"
 	"github.com/edsrzf/mmap-go"
-	"github.com/ledgerwatch/erigon-lib/common/dbg"
 	"github.com/ledgerwatch/log/v3"
 
 	"github.com/ledgerwatch/erigon-lib/common/background"
@@ -1090,11 +1089,10 @@ func (b *BtIndex) Close() {
 	}
 	if b.file != nil {
 		if err := b.m.Unmap(); err != nil {
-			log.Log(dbg.FileCloseLogLevel, "unmap", "err", err, "file", b.FileName(), "stack", dbg.Stack())
+			_ = err
 		}
-		b.m = nil
 		if err := b.file.Close(); err != nil {
-			log.Log(dbg.FileCloseLogLevel, "close", "err", err, "file", b.FileName(), "stack", dbg.Stack())
+			_ = err
 		}
 		b.file = nil
 	}

diff --git a/state/domain.go b/state/domain.go
@@ -84,7 +84,9 @@ func filesItemLess(i, j *filesItem) bool {
 }
 func (i *filesItem) closeFilesAndRemove() {
 	if i.decompressor != nil {
-		i.decompressor.Close()
+		if err := i.decompressor.Close(); err != nil {
+			log.Trace("close", "err", err, "file", i.decompressor.FileName())
+		}
 		// paranoic-mode on: don't delete frozen files
 		if !i.frozen {
 			if err := os.Remove(i.decompressor.FilePath()); err != nil {
@@ -94,7 +96,9 @@ func (i *filesItem) closeFilesAndRemove() {
 		i.decompressor = nil
 	}
 	if i.index != nil {
-		i.index.Close()
+		if err := i.index.Close(); err != nil {
+			log.Trace("close", "err", err, "file", i.index.FileName())
+		}
 		// paranoic-mode on: don't delete frozen files
 		if !i.frozen {
 			if err := os.Remove(i.index.FilePath()); err != nil {
@@ -376,11 +380,15 @@ func (d *Domain) closeWhatNotInList(fNames []string) {
 	})
 	for _, item := range toDelete {
 		if item.decompressor != nil {
-			item.decompressor.Close()
+			if err := item.decompressor.Close(); err != nil {
+				d.logger.Trace("close", "err", err, "file", item.decompressor.FileName())
+			}
 			item.decompressor = nil
 		}
 		if item.index != nil {
-			item.index.Close()
+			if err := item.index.Close(); err != nil {
+				d.logger.Trace("close", "err", err, "file", item.index.FileName())
+			}
 			item.index = nil
 		}
 		if item.bindex != nil {

diff --git a/state/history.go b/state/history.go
@@ -261,11 +261,15 @@ func (h *History) closeWhatNotInList(fNames []string) {
 	})
 	for _, item := range toDelete {
 		if item.decompressor != nil {
-			item.decompressor.Close()
+			if err := item.decompressor.Close(); err != nil {
+				h.logger.Trace("close", "err", err, "file", item.index.FileName())
+			}
 			item.decompressor = nil
 		}
 		if item.index != nil {
-			item.index.Close()
+			if err := item.index.Close(); err != nil {
+				h.logger.Trace("close", "err", err, "file", item.index.FileName())
+			}
 			item.index = nil
 		}
 		h.files.Delete(item)

diff --git a/state/inverted_index.go b/state/inverted_index.go
@@ -354,11 +354,15 @@ func (ii *InvertedIndex) closeWhatNotInList(fNames []string) {
 	})
 	for _, item := range toDelete {
 		if item.decompressor != nil {
-			item.decompressor.Close()
+			if err := item.decompressor.Close(); err != nil {
+				ii.logger.Trace("close", "err", err, "file", item.index.FileName())
+			}
 			item.decompressor = nil
 		}
 		if item.index != nil {
-			item.index.Close()
+			if err := item.index.Close(); err != nil {
+				ii.logger.Trace("close", "err", err, "file", item.index.FileName())
+			}
 			item.index = nil
 		}
 		ii.files.Delete(item)

diff --git a/state/locality_index.go b/state/locality_index.go
@@ -228,7 +228,9 @@ func closeLocalityIndexFilesAndRemove(i *ctxLocalityIdx, logger log.Logger) {
 		i.file.src = nil
 	}
 	if i.bm != nil {
-		i.bm.Close()
+		if err := i.bm.Close(); err != nil {
+			logger.Trace("close", "err", err, "file", i.bm.FileName())
+		}
 		if err := os.Remove(i.bm.FilePath()); err != nil {
 			logger.Trace("os.Remove", "err", err, "file", i.bm.FileName())
 		}