diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2024-05-12 23:31:34 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-12 11:31:34 -0700 |
| commit | d389c5b27e6ceef6fb623c0c2b8405c754d3ac5d (patch) | |
| tree | 4a5a7272e3a652468e442f5306744ec27cd043dc /weed/storage/volume_checking.go | |
| parent | 731b3aadbeacc7754f5b91ce1b3f9b96eb428f3f (diff) | |
| download | seaweedfs-d389c5b27e6ceef6fb623c0c2b8405c754d3ac5d.tar.xz seaweedfs-d389c5b27e6ceef6fb623c0c2b8405c754d3ac5d.zip | |
fix: recreate index include deleted files (#5579)
* fix: recreate index include deleted files
https://github.com/seaweedfs/seaweedfs/issues/5508
* fix: counting the number of files
* fix: log
Diffstat (limited to 'weed/storage/volume_checking.go')
| -rw-r--r-- | weed/storage/volume_checking.go | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/weed/storage/volume_checking.go b/weed/storage/volume_checking.go index 0c5f154e8..f5ceffcce 100644 --- a/weed/storage/volume_checking.go +++ b/weed/storage/volume_checking.go @@ -109,9 +109,6 @@ func verifyNeedleIntegrity(datFile backend.BackendStorageFile, v needle.Version, return 0, fmt.Errorf("verifyNeedleIntegrity check %s entry offset %d size %d: %v", datFile.Name(), offset, size, err) } n.AppendAtNs = util.BytesToUint64(bytes) - if n.HasTtl() { - return n.AppendAtNs, nil - } fileTailOffset := offset + needle.GetActualSize(size, v) fileSize, _, err := datFile.GetStat() if err != nil { @@ -130,7 +127,7 @@ func verifyNeedleIntegrity(datFile backend.BackendStorageFile, v needle.Version, return n.AppendAtNs, fmt.Errorf("read data [%d,%d) : %v", offset, offset+int64(size), err) } if n.Id != key { - return n.AppendAtNs, fmt.Errorf("index key %#x does not match needle's Id %#x", key, n.Id) + return n.AppendAtNs, fmt.Errorf("index key %v does not match needle's Id %v", key, n.Id) } return n.AppendAtNs, err } @@ -147,7 +144,7 @@ func verifyDeletedNeedleIntegrity(datFile backend.BackendStorageFile, v needle.V return n.AppendAtNs, fmt.Errorf("read data [%d,%d) : %v", fileSize-size, size, err) } if n.Id != key { - return n.AppendAtNs, fmt.Errorf("index key %#x does not match needle's Id %#x", key, n.Id) + return n.AppendAtNs, fmt.Errorf("index key %v does not match needle's Id %v", key, n.Id) } return n.AppendAtNs, err } |