mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-26 06:50:45 +01:00
* util: add listenOnLocalhost parameter to NewIpAndLocalListeners Nil keeps the current behavior of also binding localhost when the host is a specific address; all callers pass nil for now. * command: add -ip.bind.localhost flag to opt out of the extra localhost listener Binding a command to a specific -ip.bind address also opened a second listener on localhost for every port, with no way to turn it off. Each command that calls NewIpAndLocalListeners (master, master.follower, filer, s3, iam, volume, sftp, mq.broker, mq.agent) now accepts -ip.bind.localhost=false to bind only the requested address. Embedded services get prefixed flags (s3.ip.bind.localhost, sftp.ip.bind.localhost, iam.ip.bind.localhost), and the command-level flag also disables them so a single switch turns off every extra listener the command opens. * mini: only require all-interface port availability while the loopback listener is on With -ip.bind.localhost=false each service binds just -ip.bind, so a port held on another address no longer collides; the all-interface precheck would reject or relocate usable ports. WebDAV, the Admin UI, and the Admin worker gRPC (which binds -admin.worker.ip, not -ip.bind) never open a loopback companion listener, so their checks now use the address they actually bind. Generated with [Devin](https://devin.ai) Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * mq.broker: bind the gRPC listener to -ip.bind instead of all interfaces The listener used an empty host so -ip was ignored for binding and the localhost companion was never created, leaving -ip.bind.localhost with nothing to control. Give the broker the same -ip/-ip.bind pair the other servers use; embedded mode binds to -ip.bind like its peers. * server: add -sftp.ip.bind.localhost and -iam.ip.bind.localhost switches weed filer already exposes the prefixed opt-outs for its embedded sftp and iam; give weed server the same pair so each extra listener can be disabled individually while -ip.bind.localhost=false still turns them all off. * mq.broker: keep the default all-interface bind unless localhost is off An unset -ip.bind used to mean the standalone broker listened on every interface; defaulting it to -ip silently cut off multi-homed clients. Only fall back to -ip when -ip.bind.localhost=false, where a specific bind is needed for the opt-out to take effect. * mini: validate the Admin HTTP port on the address it will bind The port check always used -ip.bind while startMiniAdminWithWorker falls back to loopback when Admin has no credential, so a loopback-held port passed validation and killed the admin at startup. * mq.broker: keep the all-interface default bind when -ip.bind is unset -ip only becomes the fallback once -ip.bind.localhost=false needs a specific address for the listener. Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * mini: validate the Admin HTTP port on its effective bind IP When the Admin listener falls back to loopback (no credential or mTLS configured), the pre-flight port check now probes that same address instead of -ip.bind. Co-Authored-By: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com> * util: keep NewIpAndLocalListeners source-compatible for 3-arg callers * command: drop the -ip.bind.localhost flag; an explicit -ip.bind drops the extra listener Instead of an opt-out flag, the loopback companion listener now simply follows whether the bind address was chosen: it is created only while -ip.bind is unset and the bind address falls back to -ip. Passing -ip.bind=<addr> binds each port to exactly that address. Each service options struct carries a listenOnLocalhost *bool that embedders (weed server, weed mini, embedded s3/sftp/iam in weed filer) set from the parent's -ip.bind state, captured before the bind flag is repointed or filled in by the -ip fallback; standalone commands derive it from their own flag before the fallback runs. iam and mq.agent gain a real -ip.bind flag so they have a way to pin a single address. mq.broker keeps its new -ip.bind flag but drops the -ip.bind.localhost fallback hack: empty still listens on all interfaces. * server: default embedded mq.agent brokers to the broker's bind address With an explicit -ip.bind the embedded broker no longer listens on localhost, so an unset -mq.agent.brokers defaulting to localhost:17777 could not reach it. Default to <serverBindIp>:<mq.broker.port> (the address the embedded broker binds), falling back to localhost when the bind address is a wildcard. An explicit -mq.agent.brokers still wins. Also fix the NewIpAndLocalListeners skip message to say localhost. * server: bind embedded mq.agent to serverBindIp The embedded agent's ipBind was never set, so startQueueAgent fell back to the advertised -ip address and an explicit -ip.bind did not pin the agent listener. --------- Co-authored-by: Devin <158243242+devin-ai-integration[bot]@users.noreply.github.com>
110 lines
3.4 KiB
Go
110 lines
3.4 KiB
Go
package command
|
|
|
|
import (
|
|
"github.com/seaweedfs/seaweedfs/weed/mq/agent"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb/mq_agent_pb"
|
|
"google.golang.org/grpc"
|
|
"google.golang.org/grpc/reflection"
|
|
|
|
"github.com/seaweedfs/seaweedfs/weed/glog"
|
|
"github.com/seaweedfs/seaweedfs/weed/pb"
|
|
"github.com/seaweedfs/seaweedfs/weed/security"
|
|
"github.com/seaweedfs/seaweedfs/weed/util"
|
|
)
|
|
|
|
var (
|
|
mqAgentOptions MessageQueueAgentOptions
|
|
)
|
|
|
|
type MessageQueueAgentOptions struct {
|
|
brokers []pb.ServerAddress
|
|
brokersString *string
|
|
filerGroup *string
|
|
ip *string
|
|
ipBind *string
|
|
listenOnLocalhost *bool
|
|
port *int
|
|
}
|
|
|
|
func init() {
|
|
cmdMqAgent.Run = runMqAgent // break init cycle
|
|
mqAgentOptions.brokersString = cmdMqAgent.Flag.String("broker", "localhost:17777", "comma-separated message queue brokers")
|
|
mqAgentOptions.ip = cmdMqAgent.Flag.String("ip", "", "message queue agent host address")
|
|
mqAgentOptions.ipBind = cmdMqAgent.Flag.String("ip.bind", "", "ip address to bind to. If empty, default to same as -ip option.")
|
|
mqAgentOptions.port = cmdMqAgent.Flag.Int("port", 16777, "message queue agent gRPC server port")
|
|
}
|
|
|
|
var cmdMqAgent = &Command{
|
|
UsageLine: "mq.agent [-port=16777] [-broker=<ip:port>]",
|
|
Short: "<WIP> start a message queue agent",
|
|
Long: `start a message queue agent
|
|
|
|
The agent runs on local server to accept gRPC calls to write or read messages.
|
|
The messages are sent to message queue brokers.
|
|
|
|
`,
|
|
}
|
|
|
|
func runMqAgent(cmd *Command, args []string) bool {
|
|
|
|
util.LoadSecurityConfiguration()
|
|
|
|
mqAgentOptions.brokers = pb.ServerAddresses(*mqAgentOptions.brokersString).ToAddresses()
|
|
|
|
return mqAgentOptions.startQueueAgent()
|
|
|
|
}
|
|
|
|
func (mqAgentOpt *MessageQueueAgentOptions) startQueueAgent() bool {
|
|
|
|
grpcDialOption := security.LoadClientTLS(util.GetViper(), "grpc.msg_agent")
|
|
|
|
agentServer := agent.NewMessageQueueAgent(&agent.MessageQueueAgentOptions{
|
|
SeedBrokers: mqAgentOpt.brokers,
|
|
}, grpcDialOption)
|
|
|
|
// The loopback companion listener is only kept while -ip.bind is unset and
|
|
// the bind address falls back to -ip. An explicit -ip.bind pins the port to
|
|
// exactly that address.
|
|
bindIp := *mqAgentOpt.ip
|
|
listenOnLocalhost := mqAgentOpt.ipBind == nil || *mqAgentOpt.ipBind == ""
|
|
if mqAgentOpt.ipBind != nil && *mqAgentOpt.ipBind != "" {
|
|
bindIp = *mqAgentOpt.ipBind
|
|
}
|
|
if mqAgentOpt.listenOnLocalhost != nil {
|
|
listenOnLocalhost = *mqAgentOpt.listenOnLocalhost
|
|
}
|
|
|
|
// start grpc listener
|
|
grpcL, localL, err := util.NewIpAndLocalListeners(bindIp, *mqAgentOpt.port, 0, listenOnLocalhost)
|
|
if err != nil {
|
|
glog.Fatalf("failed to listen on grpc port %d: %v", *mqAgentOpt.port, err)
|
|
}
|
|
|
|
// Create main gRPC server
|
|
grpcS := pb.NewGrpcServer()
|
|
mq_agent_pb.RegisterSeaweedMessagingAgentServer(grpcS, agentServer)
|
|
reflection.Register(grpcS)
|
|
|
|
// Start localhost listener if available
|
|
if localL != nil {
|
|
localGrpcS := pb.NewGrpcServer()
|
|
mq_agent_pb.RegisterSeaweedMessagingAgentServer(localGrpcS, agentServer)
|
|
reflection.Register(localGrpcS)
|
|
go func() {
|
|
glog.V(0).Infof("MQ Agent listening on localhost:%d", *mqAgentOpt.port)
|
|
if err := localGrpcS.Serve(localL); err != nil {
|
|
glog.Errorf("MQ Agent localhost listener error: %v", err)
|
|
}
|
|
}()
|
|
}
|
|
|
|
glog.Infof("Start Seaweed Message Queue Agent on %s:%d", bindIp, *mqAgentOpt.port)
|
|
if err := grpcS.Serve(grpcL); err != nil && err != grpc.ErrServerStopped {
|
|
glog.Errorf("MQ Agent failed to start: %v", err)
|
|
}
|
|
|
|
return true
|
|
|
|
}
|