Revert "Revert "Merge branch 'master' of https://github.com/seaweedfs/seaweedfs""
This reverts commit 8cb42c39
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
||||
"path"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding"
|
||||
"github.com/seaweedfs/seaweedfs/weed/storage/needle"
|
||||
@@ -144,8 +145,8 @@ func (l *DiskLocation) loadAllEcShards() (err error) {
|
||||
}
|
||||
dirEntries = append(dirEntries, indexDirEntries...)
|
||||
}
|
||||
slices.SortFunc(dirEntries, func(a, b os.DirEntry) bool {
|
||||
return a.Name() < b.Name()
|
||||
slices.SortFunc(dirEntries, func(a, b os.DirEntry) int {
|
||||
return strings.Compare(a.Name(), b.Name())
|
||||
})
|
||||
var sameVolumeShards []string
|
||||
var prevVolumeId needle.VolumeId
|
||||
|
||||
Reference in New Issue
Block a user