diff options
| author | chrislu <chris.lu@gmail.com> | 2024-05-30 12:03:22 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-05-30 12:03:22 -0700 |
| commit | 41cc825ddbeaea3659e6899f1753be83554ae9fe (patch) | |
| tree | c7fdc71a565feadfa5e847c445046a27a515aa27 /weed | |
| parent | d1f0c404023a6ad5b4b9b80b85ef41948fc0c48e (diff) | |
| parent | 3ddfd15ec1428f9928a1248f8f8b7bc00ffd89b7 (diff) | |
| download | seaweedfs-41cc825ddbeaea3659e6899f1753be83554ae9fe.tar.xz seaweedfs-41cc825ddbeaea3659e6899f1753be83554ae9fe.zip | |
Merge branch 'master' into mq
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/filer/ydb/ydb_store.go | 2 | ||||
| -rw-r--r-- | weed/server/master_grpc_server.go | 2 | ||||
| -rw-r--r-- | weed/shell/command_volume_server_leave.go | 2 | ||||
| -rw-r--r-- | weed/topology/topology_info.go | 1 | ||||
| -rw-r--r-- | weed/topology/volume_growth.go | 1 |
5 files changed, 6 insertions, 2 deletions
diff --git a/weed/filer/ydb/ydb_store.go b/weed/filer/ydb/ydb_store.go index 7b26d6182..b4f2de5b8 100644 --- a/weed/filer/ydb/ydb_store.go +++ b/weed/filer/ydb/ydb_store.go @@ -79,7 +79,7 @@ func (store *YdbStore) initialize(dirBuckets string, dsn string, tablePathPrefix } opts := []ydb.Option{ ydb.WithDialTimeout(time.Duration(dialTimeOut) * time.Second), - environ.WithEnvironCredentials(ctx), + environ.WithEnvironCredentials(), } if poolSizeLimit > 0 { opts = append(opts, ydb.WithSessionPoolSizeLimit(poolSizeLimit)) 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/shell/command_volume_server_leave.go b/weed/shell/command_volume_server_leave.go index c4714b885..d0dd023af 100644 --- a/weed/shell/command_volume_server_leave.go +++ b/weed/shell/command_volume_server_leave.go @@ -25,7 +25,7 @@ func (c *commandVolumeServerLeave) Name() string { func (c *commandVolumeServerLeave) Help() string { return `stop a volume server from sending heartbeats to the master - volume.unmount -node <volume server host:port> -force + volumeServer.leave -node <volume server host:port> -force This command enables gracefully shutting down the volume server. The volume server will stop sending heartbeats to the master. 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)}, }) } |