diff options
| author | hilimd <68371223+hilimd@users.noreply.github.com> | 2020-10-19 15:16:44 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-19 15:16:44 +0800 |
| commit | 2c40f56e5a2e4792361b6df0bb6e879726f340ab (patch) | |
| tree | f6f3187326108f096fff59930b1589705bb416a2 | |
| parent | 6e63e5eaf0c713cac3ee48c16bc1803c3509afdc (diff) | |
| parent | 69f0da5d73b6f681b2313e3230a39e254693f453 (diff) | |
| download | seaweedfs-2c40f56e5a2e4792361b6df0bb6e879726f340ab.tar.xz seaweedfs-2c40f56e5a2e4792361b6df0bb6e879726f340ab.zip | |
Merge pull request #30 from chrislusf/master
sync
| -rw-r--r-- | docker/Dockerfile.go_build | 4 | ||||
| -rw-r--r-- | docker/Dockerfile.go_build_large | 4 | ||||
| -rw-r--r-- | weed/filesys/wfs_write.go | 2 | ||||
| -rw-r--r-- | weed/server/filer_server_handlers_write.go | 6 |
4 files changed, 12 insertions, 4 deletions
diff --git a/docker/Dockerfile.go_build b/docker/Dockerfile.go_build index 306ce3aa1..29b9a85d8 100644 --- a/docker/Dockerfile.go_build +++ b/docker/Dockerfile.go_build @@ -2,7 +2,9 @@ FROM frolvlad/alpine-glibc as builder RUN apk add git go g++ RUN mkdir -p /go/src/github.com/chrislusf/ RUN git clone https://github.com/chrislusf/seaweedfs /go/src/github.com/chrislusf/seaweedfs -RUN cd /go/src/github.com/chrislusf/seaweedfs/weed && go install +RUN cd /go/src/github.com/chrislusf/seaweedfs/weed \ + && export LDFLAGS="-X github.com/chrislusf/seaweedfs/weed/util.COMMIT=$(git rev-parse --short HEAD)" \ + && go install -ldflags "${LDFLAGS}" FROM alpine AS final LABEL author="Chris Lu" diff --git a/docker/Dockerfile.go_build_large b/docker/Dockerfile.go_build_large index e0af93173..fa22aeade 100644 --- a/docker/Dockerfile.go_build_large +++ b/docker/Dockerfile.go_build_large @@ -2,7 +2,9 @@ FROM frolvlad/alpine-glibc as builder RUN apk add git go g++ RUN mkdir -p /go/src/github.com/chrislusf/ RUN git clone https://github.com/chrislusf/seaweedfs /go/src/github.com/chrislusf/seaweedfs -RUN cd /go/src/github.com/chrislusf/seaweedfs/weed && go install -tags 5BytesOffset +RUN cd /go/src/github.com/chrislusf/seaweedfs/weed \ + && export LDFLAGS="-X github.com/chrislusf/seaweedfs/weed/util.COMMIT=$(git rev-parse --short HEAD)" \ + && go install -tags 5BytesOffset -ldflags "${LDFLAGS}" FROM alpine AS final LABEL author="Chris Lu" diff --git a/weed/filesys/wfs_write.go b/weed/filesys/wfs_write.go index e7db31203..27b2297ed 100644 --- a/weed/filesys/wfs_write.go +++ b/weed/filesys/wfs_write.go @@ -65,6 +65,6 @@ func (wfs *WFS) saveDataAsChunk(dir string) filer.SaveDataAsChunkFunctionType { wfs.chunkCache.SetChunk(fileId, data) chunk = uploadResult.ToPbFileChunk(fileId, offset) - return chunk, "", "", nil + return chunk, collection, replication, nil } } diff --git a/weed/server/filer_server_handlers_write.go b/weed/server/filer_server_handlers_write.go index 0091ae3ce..584ab9823 100644 --- a/weed/server/filer_server_handlers_write.go +++ b/weed/server/filer_server_handlers_write.go @@ -139,6 +139,7 @@ func (fs *FilerServer) detectCollection(requestURI, qCollection, qReplication st } // required by buckets folder + bucketDefaultReplication := "" if strings.HasPrefix(requestURI, fs.filer.DirBucketsPath+"/") { bucketAndObjectKey := requestURI[len(fs.filer.DirBucketsPath)+1:] t := strings.Index(bucketAndObjectKey, "/") @@ -148,7 +149,10 @@ func (fs *FilerServer) detectCollection(requestURI, qCollection, qReplication st if t > 0 { collection = bucketAndObjectKey[:t] } - replication, fsync = fs.filer.ReadBucketOption(collection) + bucketDefaultReplication, fsync = fs.filer.ReadBucketOption(collection) + } + if replication == "" { + replication = bucketDefaultReplication } return |