Merge branch 'master' into mq

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))

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()

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.

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))

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)},
 			})
 		}