diff options
| author | chrislu <chris.lu@gmail.com> | 2023-09-25 09:35:16 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2023-09-25 09:35:16 -0700 |
| commit | 645ae8c57bc449cbb298e90d1ad19f7d2153aea0 (patch) | |
| tree | 08458e352ea27e8e673a3670269ec84f04512d77 /weed/storage/erasure_coding | |
| parent | 3d07895518b2b6e816518be0a2355c1f0a98ff15 (diff) | |
| download | seaweedfs-645ae8c57bc449cbb298e90d1ad19f7d2153aea0.tar.xz seaweedfs-645ae8c57bc449cbb298e90d1ad19f7d2153aea0.zip | |
Revert "Revert "Merge branch 'master' of https://github.com/seaweedfs/seaweedfs""
This reverts commit 8cb42c39
Diffstat (limited to 'weed/storage/erasure_coding')
| -rw-r--r-- | weed/storage/erasure_coding/ec_volume.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/weed/storage/erasure_coding/ec_volume.go b/weed/storage/erasure_coding/ec_volume.go index 3e48e2c2d..81284d19f 100644 --- a/weed/storage/erasure_coding/ec_volume.go +++ b/weed/storage/erasure_coding/ec_volume.go @@ -84,8 +84,11 @@ func (ev *EcVolume) AddEcVolumeShard(ecVolumeShard *EcVolumeShard) bool { } } ev.Shards = append(ev.Shards, ecVolumeShard) - slices.SortFunc(ev.Shards, func(a, b *EcVolumeShard) bool { - return a.VolumeId < b.VolumeId || a.VolumeId == b.VolumeId && a.ShardId < b.ShardId + slices.SortFunc(ev.Shards, func(a, b *EcVolumeShard) int { + if a.VolumeId != b.VolumeId { + return int(a.VolumeId - b.VolumeId) + } + return int(a.ShardId - b.ShardId) }) return true } |