diff options
| author | chrislu <chris.lu@gmail.com> | 2024-05-29 10:41:33 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-05-29 10:41:33 -0700 |
| commit | 3e7a92061b726ef68dba9267ca02ab179381ea0e (patch) | |
| tree | e4b3370a4fa644498e44a4d40446d42a66c93418 | |
| parent | edeea739ed069703732ccc13fbca9a43c44120d9 (diff) | |
| download | seaweedfs-3e7a92061b726ef68dba9267ca02ab179381ea0e.tar.xz seaweedfs-3e7a92061b726ef68dba9267ca02ab179381ea0e.zip | |
pass along volume server grpc port
fix https://github.com/seaweedfs/seaweedfs/issues/5617
| -rw-r--r-- | weed/server/master_grpc_server.go | 2 | ||||
| -rw-r--r-- | weed/topology/topology_info.go | 1 | ||||
| -rw-r--r-- | weed/topology/volume_growth.go | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index 8feb909ad..b989da424 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -73,6 +73,7 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ DataCenter: dn.GetDataCenterId(), Url: dn.Url(), PublicUrl: dn.PublicUrl, + GrpcPort: uint32(dn.GrpcPort), } for _, v := range dn.GetVolumes() { message.DeletedVids = append(message.DeletedVids, uint32(v.Id)) @@ -166,6 +167,7 @@ func (ms *MasterServer) SendHeartbeat(stream master_pb.Seaweed_SendHeartbeatServ Url: dn.Url(), PublicUrl: dn.PublicUrl, DataCenter: dn.GetDataCenterId(), + GrpcPort: uint32(dn.GrpcPort), } if len(heartbeat.NewVolumes) > 0 { stats.MasterReceivedHeartbeatCounter.WithLabelValues("newVolumes").Inc() diff --git a/weed/topology/topology_info.go b/weed/topology/topology_info.go index afbeb4894..120ae0d42 100644 --- a/weed/topology/topology_info.go +++ b/weed/topology/topology_info.go @@ -80,6 +80,7 @@ func (t *Topology) ToVolumeLocations() (volumeLocations []*master_pb.VolumeLocat Url: dn.Url(), PublicUrl: dn.PublicUrl, DataCenter: dn.GetDataCenterId(), + GrpcPort: uint32(dn.GrpcPort), } for _, v := range dn.GetVolumes() { volumeLocation.NewVids = append(volumeLocation.NewVids, uint32(v.Id)) diff --git a/weed/topology/volume_growth.go b/weed/topology/volume_growth.go index 44b8b6286..cfc31c8b1 100644 --- a/weed/topology/volume_growth.go +++ b/weed/topology/volume_growth.go @@ -129,6 +129,7 @@ func (vg *VolumeGrowth) findAndGrow(grpcDialOption grpc.DialOption, topo *Topolo Url: server.Url(), PublicUrl: server.PublicUrl, DataCenter: server.GetDataCenterId(), + GrpcPort: uint32(server.GrpcPort), NewVids: []uint32{uint32(vid)}, }) } |