aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2019-11-18 19:22:54 -0800
committerChris Lu <chris.lu@gmail.com>2019-11-18 19:24:37 -0800
commitba73c053c3cf61ff83e1700c639dcb1538f42b41 (patch)
tree35c58bdee0a0904bf37607f5fe4add13567d8551
parentbe326edc1706d0dedd8953d4cc9b7a263bf45802 (diff)
downloadseaweedfs-ba73c053c3cf61ff83e1700c639dcb1538f42b41.tar.xz
seaweedfs-ba73c053c3cf61ff83e1700c639dcb1538f42b41.zip
change uuid package
fix https://github.com/chrislusf/seaweedfs/issues/1126
-rw-r--r--go.mod1
-rw-r--r--weed/s3api/filer_multipart.go4
2 files changed, 3 insertions, 2 deletions
diff --git a/go.mod b/go.mod
index 69e814bbc..24948591a 100644
--- a/go.mod
+++ b/go.mod
@@ -37,6 +37,7 @@ require (
github.com/golang/protobuf v1.3.2
github.com/google/btree v1.0.0
github.com/google/pprof v0.0.0-20190723021845-34ac40c74b70 // indirect
+ github.com/google/uuid v1.1.1
github.com/gorilla/mux v1.7.3
github.com/gorilla/websocket v1.4.1 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.11.0 // indirect
diff --git a/weed/s3api/filer_multipart.go b/weed/s3api/filer_multipart.go
index 3bf4aafac..d3bde66ee 100644
--- a/weed/s3api/filer_multipart.go
+++ b/weed/s3api/filer_multipart.go
@@ -14,7 +14,7 @@ import (
"github.com/chrislusf/seaweedfs/weed/filer2"
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
- "github.com/satori/go.uuid"
+ "github.com/google/uuid"
)
type InitiateMultipartUploadResult struct {
@@ -23,7 +23,7 @@ type InitiateMultipartUploadResult struct {
}
func (s3a *S3ApiServer) createMultipartUpload(ctx context.Context, input *s3.CreateMultipartUploadInput) (output *InitiateMultipartUploadResult, code ErrorCode) {
- uploadId, _ := uuid.NewV4()
+ uploadId, _ := uuid.NewRandom()
uploadIdString := uploadId.String()
if err := s3a.mkdir(ctx, s3a.genUploadsFolder(*input.Bucket), uploadIdString, func(entry *filer_pb.Entry) {