diff options
| -rw-r--r-- | weed/s3api/filer_multipart.go | 3 | ||||
| -rw-r--r-- | weed/s3api/s3api_server.go | 2 | ||||
| -rw-r--r-- | weed/server/master_server.go | 2 | ||||
| -rw-r--r-- | weed/util/net_timeout.go | 4 |
4 files changed, 9 insertions, 2 deletions
diff --git a/weed/s3api/filer_multipart.go b/weed/s3api/filer_multipart.go index e62d31690..32b93307a 100644 --- a/weed/s3api/filer_multipart.go +++ b/weed/s3api/filer_multipart.go @@ -178,6 +178,9 @@ func findByPartNumber(fileName string, parts []CompletedPart) (etag string, foun x := sort.Search(len(parts), func(i int) bool { return parts[i].PartNumber >= partNumber }) + if x >= len(parts) { + return + } if parts[x].PartNumber != partNumber { return } diff --git a/weed/s3api/s3api_server.go b/weed/s3api/s3api_server.go index 561edd924..b0b8e27e4 100644 --- a/weed/s3api/s3api_server.go +++ b/weed/s3api/s3api_server.go @@ -54,7 +54,7 @@ func NewS3ApiServer(router *mux.Router, option *S3ApiServerOption) (s3ApiServer randomClientId: util.RandomInt32(), filerGuard: security.NewGuard([]string{}, signingKey, expiresAfterSec, readSigningKey, readExpiresAfterSec), } - if option.LocalFilerSocket == nil { + if option.LocalFilerSocket == nil || *option.LocalFilerSocket == "" { s3ApiServer.client = &http.Client{Transport: &http.Transport{ MaxIdleConns: 1024, MaxIdleConnsPerHost: 1024, diff --git a/weed/server/master_server.go b/weed/server/master_server.go index 5b8c28698..e02552730 100644 --- a/weed/server/master_server.go +++ b/weed/server/master_server.go @@ -272,6 +272,8 @@ func (ms *MasterServer) startAdminScripts() { shellOptions.Masters = &masterAddress shellOptions.Directory = "/" + emptyFilerGroup := "" + shellOptions.FilerGroup = &emptyFilerGroup commandEnv := shell.NewCommandEnv(&shellOptions) diff --git a/weed/util/net_timeout.go b/weed/util/net_timeout.go index 21aab30f8..536359eec 100644 --- a/weed/util/net_timeout.go +++ b/weed/util/net_timeout.go @@ -1,6 +1,7 @@ package util import ( + "github.com/chrislusf/seaweedfs/weed/glog" "net" "time" @@ -112,7 +113,8 @@ func NewIpAndLocalListeners(host string, port int, timeout time.Duration) (ipLis if host != "localhost" && host != "" && host != "0.0.0.0" && host != "127.0.0.1" && host != "[::]" && host != "[::1]" { listner, err = net.Listen("tcp", JoinHostPort("localhost", port)) if err != nil { - return + glog.V(0).Infof("skip starting on %s:%d: %v", host, port, err) + return ipListner, nil, nil } localListener = &Listener{ |