err handling

erigontech · Oct 10, 2024 · 3b57924 · 3b57924
1 parent 56fe30b
commit 3b57924
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/erigon-lib/downloader/downloader.go b/erigon-lib/downloader/downloader.go
@@ -2976,7 +2976,7 @@ func (d *Downloader) torrentCompleted(tName string, tHash metainfo.Hash) {
 	}
 
 	// create commitment file for .seg/.idx files
-	if !strings.HasSuffix(tName, ".seg") || !strings.HasSuffix(tName, ".idx") {
+	if !strings.HasSuffix(tName, ".seg") && !strings.HasSuffix(tName, ".idx") {
 		return
 	}
 	tName = strings.ReplaceAll(tName, ".seg", ".txt")

diff --git a/turbo/snapshotsync/freezeblocks/block_snapshots.go b/turbo/snapshotsync/freezeblocks/block_snapshots.go
@@ -757,19 +757,27 @@ func (s *RoSnapshots) integrityCheck(fName string) bool {
 func integrityCheck(dir, fName string) bool {
 	file := filepath.Join(dir, fName)
 	f, err := os.Stat(file)
-	if os.IsNotExist(err) {
+	if err != nil {
+		log.Warn("[snapshots] integrityCheck", "err", err)
 		return false
 	}
 	torrentFile := filepath.Join(dir, fName) + ".torrent"
-	if _, err := os.Stat(torrentFile); os.IsNotExist(err) {
+	_, err = os.Stat(torrentFile)
+	if err != nil {
+		if !os.IsNotExist(err) {
+			log.Warn("[snapshots] integrityCheck", "err", err)
+		}
 		// torrent file not exists means that file is created locally, in this case file must be complete
 		return true
 	}
 	fName = strings.ReplaceAll(fName, ".seg", ".txt")
 	fName = strings.ReplaceAll(fName, ".idx", ".txt")
 	commitmentFile := filepath.Join(dir, "commitment", fName)
 	cf, err := os.Stat(commitmentFile)
-	if os.IsNotExist(err) {
+	if err != nil {
+		if !os.IsNotExist(err) {
+			log.Warn("[snapshots] integrityCheck", "err", err)
+		}
 		return false
 	}
 	if cf.ModTime().After(f.ModTime()) {