aboutsummaryrefslogtreecommitdiff
path: root/weed/storage/erasure_coding
diff options
context:
space:
mode:
authorchrislu <chris.lu@gmail.com>2023-09-18 16:12:50 -0700
committerchrislu <chris.lu@gmail.com>2023-09-18 16:12:50 -0700
commit8cb42c39adbbe7f082009cf91eccb4d2dc527235 (patch)
treea4a54f1e1211e273bede5ecc39ed9513316c596d /weed/storage/erasure_coding
parent2e5aa06026750c99ea283181974d2ccfe5eb0468 (diff)
downloadseaweedfs-8cb42c39adbbe7f082009cf91eccb4d2dc527235.tar.xz
seaweedfs-8cb42c39adbbe7f082009cf91eccb4d2dc527235.zip
Revert "Merge branch 'master' of https://github.com/seaweedfs/seaweedfs"
This reverts commit 2e5aa06026750c99ea283181974d2ccfe5eb0468, reversing changes made to 4d414f54a224142f3f4d934f4af3b5dceb6fec6b.
Diffstat (limited to 'weed/storage/erasure_coding')
-rw-r--r--weed/storage/erasure_coding/ec_volume.go7
1 files changed, 2 insertions, 5 deletions
diff --git a/weed/storage/erasure_coding/ec_volume.go b/weed/storage/erasure_coding/ec_volume.go
index 81284d19f..3e48e2c2d 100644
--- a/weed/storage/erasure_coding/ec_volume.go
+++ b/weed/storage/erasure_coding/ec_volume.go
@@ -84,11 +84,8 @@ func (ev *EcVolume) AddEcVolumeShard(ecVolumeShard *EcVolumeShard) bool {
}
}
ev.Shards = append(ev.Shards, ecVolumeShard)
- 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)
+ slices.SortFunc(ev.Shards, func(a, b *EcVolumeShard) bool {
+ return a.VolumeId < b.VolumeId || a.VolumeId == b.VolumeId && a.ShardId < b.ShardId
})
return true
}