lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-09-23 11:43:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

pass along volume server grpc port

Browse Source 
fix https://github.com/seaweedfs/seaweedfs/issues/5617
This commit is contained in:
chrislu
2024-05-29 10:41:33 -07:00
parent edeea739ed
commit 3e7a92061b
3 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
weed/server/master_grpc_server.go
View File

@@ -73,6 +73,7 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ
DataCenter: dn.GetDataCenterId(), DataCenter: dn.GetDataCenterId(),
Url: dn.Url(), Url: dn.Url(),
PublicUrl: dn.PublicUrl, PublicUrl: dn.PublicUrl,
GrpcPort: uint32(dn.GrpcPort),
} }
for _, v := range dn.GetVolumes() { for _, v := range dn.GetVolumes() {
message.DeletedVids = append(message.DeletedVids, uint32(v.Id)) message.DeletedVids = append(message.DeletedVids, uint32(v.Id))
@@ -166,6 +167,7 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ
Url: dn.Url(), Url: dn.Url(),
PublicUrl: dn.PublicUrl, PublicUrl: dn.PublicUrl,
DataCenter: dn.GetDataCenterId(), DataCenter: dn.GetDataCenterId(),
GrpcPort: uint32(dn.GrpcPort),
} }
if len(heartbeat.NewVolumes) > 0 { if len(heartbeat.NewVolumes) > 0 {
stats.MasterReceivedHeartbeatCounter.WithLabelValues("newVolumes").Inc() stats.MasterReceivedHeartbeatCounter.WithLabelValues("newVolumes").Inc()

1
weed/topology/topology_info.go
View File

@@ -80,6 +80,7 @@ func (t *Topology) ToVolumeLocations() (volumeLocations []*master_pb.VolumeLocat
Url: dn.Url(), Url: dn.Url(),
PublicUrl: dn.PublicUrl, PublicUrl: dn.PublicUrl,
DataCenter: dn.GetDataCenterId(), DataCenter: dn.GetDataCenterId(),
GrpcPort: uint32(dn.GrpcPort),
} }
for _, v := range dn.GetVolumes() { for _, v := range dn.GetVolumes() {
volumeLocation.NewVids = append(volumeLocation.NewVids, uint32(v.Id)) volumeLocation.NewVids = append(volumeLocation.NewVids, uint32(v.Id))

1
weed/topology/volume_growth.go
View File

@@ -129,6 +129,7 @@ func (vg *VolumeGrowth) findAndGrow(grpcDialOption grpc.DialOption, topo *Topolo
Url: server.Url(), Url: server.Url(),
PublicUrl: server.PublicUrl, PublicUrl: server.PublicUrl,
DataCenter: server.GetDataCenterId(), DataCenter: server.GetDataCenterId(),
GrpcPort: uint32(server.GrpcPort),
NewVids: []uint32{uint32(vid)}, NewVids: []uint32{uint32(vid)},
}) })
} }