Browse Source
Merge pull request #3022 from carlos19960601/fix-typo
fix typo
pull/3024/head
Chris Lu
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
3 deletions
-
weed/topology/allocate_volume.go
-
weed/topology/volume_growth.go
|
|
|
@ -17,7 +17,7 @@ func AllocateVolume(dn *DataNode, grpcDialOption grpc.DialOption, vid needle.Vol |
|
|
|
|
|
|
|
return operation.WithVolumeServerClient(false, dn.ServerAddress(), grpcDialOption, func(client volume_server_pb.VolumeServerClient) error { |
|
|
|
|
|
|
|
_, deleteErr := client.AllocateVolume(context.Background(), &volume_server_pb.AllocateVolumeRequest{ |
|
|
|
_, allocateErr := client.AllocateVolume(context.Background(), &volume_server_pb.AllocateVolumeRequest{ |
|
|
|
VolumeId: uint32(vid), |
|
|
|
Collection: option.Collection, |
|
|
|
Replication: option.ReplicaPlacement.String(), |
|
|
|
@ -26,7 +26,7 @@ func AllocateVolume(dn *DataNode, grpcDialOption grpc.DialOption, vid needle.Vol |
|
|
|
MemoryMapMaxSizeMb: option.MemoryMapMaxSizeMb, |
|
|
|
DiskType: string(option.DiskType), |
|
|
|
}) |
|
|
|
return deleteErr |
|
|
|
return allocateErr |
|
|
|
}) |
|
|
|
|
|
|
|
} |
|
|
|
@ -181,7 +181,7 @@ func (vg *VolumeGrowth) findEmptySlotsForOneVolume(topo *Topology, option *Volum |
|
|
|
return nil, rackErr |
|
|
|
} |
|
|
|
|
|
|
|
//find main rack and other racks
|
|
|
|
//find main server and other servers
|
|
|
|
mainServer, otherServers, serverErr := mainRack.(*Rack).PickNodesByWeight(rp.SameRackCount+1, option, func(node Node) error { |
|
|
|
if option.DataNode != "" && node.IsDataNode() && node.Id() != NodeId(option.DataNode) { |
|
|
|
return fmt.Errorf("Not matching preferred data node:%s", option.DataNode) |
|
|
|
|
