gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "fix: volume data integrity check (#6118)"

Browse Source 
This reverts commit e12b9ab746.
This commit is contained in:
chrislu
2024-10-17 18:52:30 -07:00
parent 7bd638de47
commit f11567816e
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
weed/storage/volume_checking.go
View File

@@ -2,11 +2,10 @@ package storage
import ( import (
"fmt" "fmt"
"github.com/seaweedfs/seaweedfs/weed/storage/super_block"
"io" "io"
"os" "os"
"github.com/seaweedfs/seaweedfs/weed/storage/super_block"
"github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/glog"
"github.com/seaweedfs/seaweedfs/weed/storage/backend" "github.com/seaweedfs/seaweedfs/weed/storage/backend"
"github.com/seaweedfs/seaweedfs/weed/storage/idx" "github.com/seaweedfs/seaweedfs/weed/storage/idx"
@@ -27,11 +26,11 @@ func CheckVolumeDataIntegrity(v *Volume, indexFile *os.File) (lastAppendAtNs uin
for i := 1; i <= 10 && indexSize >= int64(i)*NeedleMapEntrySize; i++ { for i := 1; i <= 10 && indexSize >= int64(i)*NeedleMapEntrySize; i++ {
// check and fix last 10 entries // check and fix last 10 entries
lastAppendAtNs, err = doCheckAndFixVolumeData(v, indexFile, indexSize-int64(i)*NeedleMapEntrySize) lastAppendAtNs, err = doCheckAndFixVolumeData(v, indexFile, indexSize-int64(i)*NeedleMapEntrySize)
if err != nil { if err == io.EOF {
if err == io.EOF { healthyIndexSize = indexSize - int64(i)*NeedleMapEntrySize
healthyIndexSize = indexSize - int64(i)*NeedleMapEntrySize continue
continue }
} if err != ErrorSizeMismatch {
break break
} }
} }