Browse Source
[volume] remove truncate idx file if size not healthy (#6043)
dependabot/maven/other/java/client/com.google.protobuf-protobuf-java-3.25.5
Konstantin Lebedev
3 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
3 additions and
7 deletions
-
weed/storage/volume_checking.go
-
weed/storage/volume_loading.go
|
|
@ -14,7 +14,7 @@ import ( |
|
|
|
"github.com/seaweedfs/seaweedfs/weed/util" |
|
|
|
) |
|
|
|
|
|
|
|
func CheckAndFixVolumeDataIntegrity(v *Volume, indexFile *os.File) (lastAppendAtNs uint64, err error) { |
|
|
|
func CheckVolumeDataIntegrity(v *Volume, indexFile *os.File) (lastAppendAtNs uint64, err error) { |
|
|
|
var indexSize int64 |
|
|
|
if indexSize, err = verifyIndexFileIntegrity(indexFile); err != nil { |
|
|
|
return 0, fmt.Errorf("verifyIndexFileIntegrity %s failed: %v", indexFile.Name(), err) |
|
|
@ -35,11 +35,7 @@ func CheckAndFixVolumeDataIntegrity(v *Volume, indexFile *os.File) (lastAppendAt |
|
|
|
} |
|
|
|
} |
|
|
|
if healthyIndexSize < indexSize { |
|
|
|
glog.Warningf("CheckAndFixVolumeDataIntegrity truncate idx file %s from %d to %d", indexFile.Name(), indexSize, healthyIndexSize) |
|
|
|
err = indexFile.Truncate(healthyIndexSize) |
|
|
|
if err != nil { |
|
|
|
glog.Warningf("CheckAndFixVolumeDataIntegrity truncate idx file %s from %d to %d: %v", indexFile.Name(), indexSize, healthyIndexSize, err) |
|
|
|
} |
|
|
|
return 0, fmt.Errorf("CheckVolumeDataIntegrity %s failed: index size %d differs from healthy size %d", indexFile.Name(), indexSize, healthyIndexSize) |
|
|
|
} |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
@ -135,7 +135,7 @@ func (v *Volume) load(alsoLoadIndex bool, createDatIfMissing bool, needleMapKind |
|
|
|
// capactiy overloading.
|
|
|
|
if !v.HasRemoteFile() { |
|
|
|
glog.V(0).Infof("checking volume data integrity for volume %d", v.Id) |
|
|
|
if v.lastAppendAtNs, err = CheckAndFixVolumeDataIntegrity(v, indexFile); err != nil { |
|
|
|
if v.lastAppendAtNs, err = CheckVolumeDataIntegrity(v, indexFile); err != nil { |
|
|
|
v.noWriteOrDelete = true |
|
|
|
glog.V(0).Infof("volumeDataIntegrityChecking failed %v", err) |
|
|
|
} |
|
|
|