lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-04-05 20:52:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix calculation of node's free EC shard slots. (#6584)
Some checks are pending
go: build dev binaries / cleanup (push) Waiting to run
Details
go: build dev binaries / build_dev_linux_windows (amd64, linux) (push) Blocked by required conditions
Details
go: build dev binaries / build_dev_linux_windows (amd64, windows) (push) Blocked by required conditions
Details
go: build dev binaries / build_dev_darwin (amd64, darwin) (push) Blocked by required conditions
Details
go: build dev binaries / build_dev_darwin (arm64, darwin) (push) Blocked by required conditions
Details
docker: build dev containers / build-dev-containers (push) Waiting to run
Details
End to End / FUSE Mount (push) Waiting to run
Details
go: build binary / Build (push) Waiting to run
Details
Ceph S3 tests / Ceph S3 tests (push) Waiting to run
Details

Browse Source
This commit is contained in:
Lisandro Pin 2025-02-28 16:35:28 +01:00 committed by GitHub
parent 314f211260
commit 76a111f0a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 97 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
weed/shell/command_ec_common.go
View File

@ -429,7 +429,13 @@ func countFreeShardSlots(dn *master_pb.DataNodeInfo, diskType types.DiskType) (c
if diskInfo == nil {
return 0
}
return int(diskInfo.MaxVolumeCount-diskInfo.VolumeCount)*erasure_coding.DataShardsCount - countShards(diskInfo.EcShardInfos)
slots := int(diskInfo.MaxVolumeCount-diskInfo.VolumeCount)*erasure_coding.DataShardsCount - countShards(diskInfo.EcShardInfos)
if slots < 0 {
return 0
}
return slots
}
func (ecNode *EcNode) localShardIdCount(vid uint32) int {

90
weed/shell/command_ec_common_test.go
View File

@ -10,6 +10,7 @@ import (
"github.com/seaweedfs/seaweedfs/weed/storage/erasure_coding"
"github.com/seaweedfs/seaweedfs/weed/storage/needle"
"github.com/seaweedfs/seaweedfs/weed/storage/super_block"
"github.com/seaweedfs/seaweedfs/weed/storage/types"
)
var (
@ -264,3 +265,92 @@ func TestPickEcNodeToBalanceShardsInto(t *testing.T) {
}
}
}
func TestCountFreeShardSlots(t *testing.T) {
testCases := []struct {
name string
topology *master_pb.TopologyInfo
diskType types.DiskType
want map[string]int
}{
{
name: "topology #1, free HDD shards",
topology: topology1,
diskType: types.HardDriveType,
want: map[string]int{
"192.168.1.1:8080": 17330,
"192.168.1.2:8080": 1540,
"192.168.1.4:8080": 1900,
"192.168.1.5:8080": 27010,
"192.168.1.6:8080": 17420,
},
},
{
name: "topology #1, no free SSD shards available",
topology: topology1,
diskType: types.SsdType,
want: map[string]int{
"192.168.1.1:8080": 0,
"192.168.1.2:8080": 0,
"192.168.1.4:8080": 0,
"192.168.1.5:8080": 0,
"192.168.1.6:8080": 0,
},
},
{
name: "topology #2, no negative free HDD shards",
topology: topology2,
diskType: types.HardDriveType,
want: map[string]int{
"172.19.0.3:8708": 0,
"172.19.0.4:8707": 8,
"172.19.0.5:8705": 58,
"172.19.0.6:8713": 39,
"172.19.0.8:8709": 8,
"172.19.0.9:8712": 0,
"172.19.0.10:8702": 0,
"172.19.0.13:8701": 0,
"172.19.0.14:8711": 0,
"172.19.0.16:8704": 89,
"172.19.0.17:8703": 0,
"172.19.0.19:8700": 9,
"172.19.0.20:8706": 0,
"172.19.0.21:8710": 9,
},
},
{
name: "topology #2, no free SSD shards available",
topology: topology2,
diskType: types.SsdType,
want: map[string]int{
"172.19.0.10:8702": 0,
"172.19.0.13:8701": 0,
"172.19.0.14:8711": 0,
"172.19.0.16:8704": 0,
"172.19.0.17:8703": 0,
"172.19.0.19:8700": 0,
"172.19.0.20:8706": 0,
"172.19.0.21:8710": 0,
"172.19.0.3:8708": 0,
"172.19.0.4:8707": 0,
"172.19.0.5:8705": 0,
"172.19.0.6:8713": 0,
"172.19.0.8:8709": 0,
"172.19.0.9:8712": 0,
},
},
}
for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
got := map[string]int{}
eachDataNode(tc.topology, func(dc DataCenterId, rack RackId, dn *master_pb.DataNodeInfo) {
got[dn.Id] = countFreeShardSlots(dn, tc.diskType)
})
if !reflect.DeepEqual(got, tc.want) {
t.Errorf("got %v, want %v", got, tc.want)
}
})
}
}