MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-04 03:40:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fail gateway properly with an error on port conflicts (#6303)

Browse Source
This commit is contained in:
Harshavardhana 2018-08-17 21:06:36 -07:00 committed by kannappanr
parent 6c0d53a1c5
commit a6b8a5487a
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
cmd/gateway-main.go
View File

@ -22,7 +22,6 @@ import (
"net/url" "net/url"
"os" "os"
"os/signal" "os/signal"
"runtime"
"strings" "strings"
"syscall" "syscall"
@ -83,17 +82,6 @@ func ValidateGatewayArguments(serverAddr, endpointAddr string) error {
return err return err
} }
if runtime.GOOS == "darwin" {
_, port := mustSplitHostPort(serverAddr)
// On macOS, if a process already listens on LOCALIPADDR:PORT, net.Listen() falls back
// to IPv6 address i.e minio will start listening on IPv6 address whereas another
// (non-)minio process is listening on IPv4 of given port.
// To avoid this error situation we check for port availability only for macOS.
if err := checkPortAvailability(port); err != nil {
return err
}
}
if endpointAddr != "" { if endpointAddr != "" {
// Reject the endpoint if it points to the gateway handler itself. // Reject the endpoint if it points to the gateway handler itself.
sameTarget, err := sameLocalAddrs(endpointAddr, serverAddr) sameTarget, err := sameLocalAddrs(endpointAddr, serverAddr)
@ -148,6 +136,12 @@ func StartGateway(ctx *cli.Context, gw Gateway) {
// Handle common env vars. // Handle common env vars.
handleCommonEnvVars() handleCommonEnvVars()
// On macOS, if a process already listens on LOCALIPADDR:PORT, net.Listen() falls back
// to IPv6 address ie minio will start listening on IPv6 address whereas another
// (non-)minio process is listening on IPv4 of given port.
// To avoid this error situation we check for port availability.
logger.FatalIf(checkPortAvailability(globalMinioPort), "Unable to start the server")
// Validate if we have access, secret set through environment. // Validate if we have access, secret set through environment.
if !globalIsEnvCreds { if !globalIsEnvCreds {
logger.Fatal(uiErrEnvCredentialsMissingGateway(nil), "Unable to start gateway") logger.Fatal(uiErrEnvCredentialsMissingGateway(nil), "Unable to start gateway")

1
cmd/http/listen_nix.go
View File

@ -21,7 +21,6 @@ package http
import "github.com/valyala/tcplisten" import "github.com/valyala/tcplisten"
var cfg = &tcplisten.Config{ var cfg = &tcplisten.Config{
ReusePort: true,
DeferAccept: true, DeferAccept: true,
FastOpen: true, FastOpen: true,
} }