diff options
| author | Lisandro Pin <lisandro.pin@proton.ch> | 2024-11-19 15:33:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-19 06:33:18 -0800 |
| commit | 0d5393641eab18ec356c7e0ebaf51b1164094d8c (patch) | |
| tree | 38bf4a3ed3b277c9e1210bb025f4b2e34a6f09a4 /weed/shell/command_ec_common.go | |
| parent | 2caa0e37414be6feeb5a8ef0b57bdfc78c64728e (diff) | |
| download | seaweedfs-0d5393641eab18ec356c7e0ebaf51b1164094d8c.tar.xz seaweedfs-0d5393641eab18ec356c7e0ebaf51b1164094d8c.zip | |
Unify usage of shell.EcNode.dc as DataCenterId. (#6258)
Diffstat (limited to 'weed/shell/command_ec_common.go')
| -rw-r--r-- | weed/shell/command_ec_common.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/weed/shell/command_ec_common.go b/weed/shell/command_ec_common.go index b98921fd7..39c3f75c5 100644 --- a/weed/shell/command_ec_common.go +++ b/weed/shell/command_ec_common.go @@ -128,12 +128,11 @@ func oneServerCopyAndMountEcShardsFromSource(grpcDialOption grpc.DialOption, return } -// TODO: Make dc a DataCenterId instead of string. -func eachDataNode(topo *master_pb.TopologyInfo, fn func(dc string, rack RackId, dn *master_pb.DataNodeInfo)) { +func eachDataNode(topo *master_pb.TopologyInfo, fn func(dc DataCenterId, rack RackId, dn *master_pb.DataNodeInfo)) { for _, dc := range topo.DataCenterInfos { for _, rack := range dc.RackInfos { for _, dn := range rack.DataNodeInfos { - fn(dc.Id, RackId(rack.Id), dn) + fn(DataCenterId(dc.Id), RackId(rack.Id), dn) } } } @@ -223,15 +222,15 @@ func collectEcNodes(commandEnv *CommandEnv, selectedDataCenter string) (ecNodes } func collectEcVolumeServersByDc(topo *master_pb.TopologyInfo, selectedDataCenter string) (ecNodes []*EcNode, totalFreeEcSlots int) { - eachDataNode(topo, func(dc string, rack RackId, dn *master_pb.DataNodeInfo) { - if selectedDataCenter != "" && selectedDataCenter != dc { + eachDataNode(topo, func(dc DataCenterId, rack RackId, dn *master_pb.DataNodeInfo) { + if selectedDataCenter != "" && selectedDataCenter != string(dc) { return } freeEcSlots := countFreeShardSlots(dn, types.HardDriveType) ecNodes = append(ecNodes, &EcNode{ info: dn, - dc: DataCenterId(dc), + dc: dc, rack: rack, freeEcSlot: int(freeEcSlots), }) |