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/shell/command_volume_balance.go | |
| 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/shell/command_volume_balance.go')
| -rw-r--r-- | weed/shell/command_volume_balance.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/weed/shell/command_volume_balance.go b/weed/shell/command_volume_balance.go index b2b65d5d2..2284ceea6 100644 --- a/weed/shell/command_volume_balance.go +++ b/weed/shell/command_volume_balance.go @@ -243,8 +243,8 @@ func (n *Node) selectVolumes(fn func(v *master_pb.VolumeInformationMessage) bool } func sortWritableVolumes(volumes []*master_pb.VolumeInformationMessage) { - slices.SortFunc(volumes, func(a, b *master_pb.VolumeInformationMessage) bool { - return a.Size < b.Size + slices.SortFunc(volumes, func(a, b *master_pb.VolumeInformationMessage) int { + return int(a.Size - b.Size) }) } @@ -269,8 +269,8 @@ func balanceSelectedVolume(commandEnv *CommandEnv, diskType types.DiskType, volu for hasMoved { hasMoved = false - slices.SortFunc(nodesWithCapacity, func(a, b *Node) bool { - return a.localVolumeRatio(capacityFunc) < b.localVolumeRatio(capacityFunc) + slices.SortFunc(nodesWithCapacity, func(a, b *Node) int { + return int(a.localVolumeRatio(capacityFunc) - b.localVolumeRatio(capacityFunc)) }) if len(nodesWithCapacity) == 0 { fmt.Printf("no volume server found with capacity for %s", diskType.ReadableString()) |