From 3713119ab98f68c13cdfe563463b9aec61e8dd0a Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Sat, 2 Jul 2016 23:45:37 -0700
Subject: [PATCH] adjust verification logic.

1. log file name for easier debugging
2. remove unused version in readIndexEntryAtOffset()
3. if indexSize==0, the dataFile usually still has a super block of
size 8. So skipping this case.
---
 weed/storage/volume.go | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/weed/storage/volume.go b/weed/storage/volume.go
index 4c125fa4e..baea18b46 100644
--- a/weed/storage/volume.go
+++ b/weed/storage/volume.go
@@ -55,7 +55,7 @@ func verifyIndexFileIntegrity(indexFile *os.File) (indexSize int64, err error) {
 	}
 	return
 }
-func readIndexEntryAtOffset(indexFile *os.File, offset int64, v Version) (bytes []byte, err error) {
+func readIndexEntryAtOffset(indexFile *os.File, offset int64) (bytes []byte, err error) {
 	if offset < 0 {
 		err = fmt.Errorf("offset %d for index file is invalid", offset)
 		return
@@ -79,23 +79,18 @@ func volumeDataIntegrityChecking(v *Volume, indexFile *os.File) error {
 	var indexSize int64
 	var e error
 	if indexSize, e = verifyIndexFileIntegrity(indexFile); e != nil {
-		return fmt.Errorf("verifyIndexFileIntegrity failed: %v", e)
+		return fmt.Errorf("verifyIndexFileIntegrity %s failed: %v", indexFile.Name(), e)
 	}
-	if indexSize != 0 {
-		var lastIdxEntry []byte
-		if lastIdxEntry, e = readIndexEntryAtOffset(indexFile, indexSize-NeedleIndexSize, v.Version()); e != nil {
-			return fmt.Errorf("readLastIndexEntry failed: %v", e)
-		}
-		key, offset, size := idxFileEntry(lastIdxEntry)
-		if e = verifyNeedleIntegrity(v.dataFile, v.Version(), int64(offset)*NeedlePaddingSize, key, size); e != nil {
-			return fmt.Errorf("verifyNeedleIntegrity failed: %v", e)
-		}
-	} else {
-		if datSize, err := util.GetFileSize(v.dataFile); err == nil {
-			if datSize > 0 {
-				return fmt.Errorf("dat file size is %d, not empty while the index file is empty!", datSize)
-			}
-		}
+	if indexSize == 0 {
+		return nil
+	}
+	var lastIdxEntry []byte
+	if lastIdxEntry, e = readIndexEntryAtOffset(indexFile, indexSize-NeedleIndexSize); e != nil {
+		return fmt.Errorf("readLastIndexEntry %s failed: %v", indexFile.Name(), e)
+	}
+	key, offset, size := idxFileEntry(lastIdxEntry)
+	if e = verifyNeedleIntegrity(v.dataFile, v.Version(), int64(offset)*NeedlePaddingSize, key, size); e != nil {
+		return fmt.Errorf("verifyNeedleIntegrity %s failed: %v", indexFile.Name(), e)
 	}
 	return nil
 }