diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2022-09-01 22:33:23 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-01 10:33:23 -0700 |
| commit | 8c3040db81ac3c3a5b80d675ba3cf044420d4b9a (patch) | |
| tree | 123184c7635b1f578884c5ec5d0e4c64f8122e64 /weed/s3api/s3api_server.go | |
| parent | 90d55cd179732a375f112c72893e2cca1b41afd1 (diff) | |
| download | seaweedfs-8c3040db81ac3c3a5b80d675ba3cf044420d4b9a.tar.xz seaweedfs-8c3040db81ac3c3a5b80d675ba3cf044420d4b9a.zip | |
avoid DATA RACE on S3Options.localFilerSocket (#3571)
* avoid DATA RACE on S3Options.localFilerSocket
https://github.com/seaweedfs/seaweedfs/issues/3552
* copy localSocket
Diffstat (limited to 'weed/s3api/s3api_server.go')
| -rw-r--r-- | weed/s3api/s3api_server.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/weed/s3api/s3api_server.go b/weed/s3api/s3api_server.go index 31ee1dc92..76163d724 100644 --- a/weed/s3api/s3api_server.go +++ b/weed/s3api/s3api_server.go @@ -28,7 +28,7 @@ type S3ApiServerOption struct { GrpcDialOption grpc.DialOption AllowEmptyFolder bool AllowDeleteBucketNotEmpty bool - LocalFilerSocket *string + LocalFilerSocket string DataCenter string } @@ -59,7 +59,7 @@ func NewS3ApiServer(router *mux.Router, option *S3ApiServerOption) (s3ApiServer filerGuard: security.NewGuard([]string{}, signingKey, expiresAfterSec, readSigningKey, readExpiresAfterSec), cb: NewCircuitBreaker(option), } - if option.LocalFilerSocket == nil || *option.LocalFilerSocket == "" { + if option.LocalFilerSocket == "" { s3ApiServer.client = &http.Client{Transport: &http.Transport{ MaxIdleConns: 1024, MaxIdleConnsPerHost: 1024, @@ -68,7 +68,7 @@ func NewS3ApiServer(router *mux.Router, option *S3ApiServerOption) (s3ApiServer s3ApiServer.client = &http.Client{ Transport: &http.Transport{ DialContext: func(_ context.Context, _, _ string) (net.Conn, error) { - return net.Dial("unix", *option.LocalFilerSocket) + return net.Dial("unix", option.LocalFilerSocket) }, }, } |