diff options
| author | bingoohuang <bingoo.huang@gmail.com> | 2021-02-20 16:45:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-20 16:45:02 +0800 |
| commit | f69356f5890f28d102d807297f8a5da915435482 (patch) | |
| tree | d5ee05dd243c1fa5d023a13f0e69d98b798802d9 /weed/server | |
| parent | 7ffe736d20f68cd0bd3d000649494e4550127c7d (diff) | |
| parent | 565f7a6e724cf2dca401bd699a65f5814606ebfe (diff) | |
| download | seaweedfs-f69356f5890f28d102d807297f8a5da915435482.tar.xz seaweedfs-f69356f5890f28d102d807297f8a5da915435482.zip | |
Merge pull request #3 from chrislusf/master
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/master_grpc_server_volume.go | 2 | ||||
| -rw-r--r-- | weed/server/master_server_handlers.go | 2 | ||||
| -rw-r--r-- | weed/server/webdav_server.go | 5 |
3 files changed, 5 insertions, 4 deletions
diff --git a/weed/server/master_grpc_server_volume.go b/weed/server/master_grpc_server_volume.go index 1699eaa36..29aff5c0b 100644 --- a/weed/server/master_grpc_server_volume.go +++ b/weed/server/master_grpc_server_volume.go @@ -77,7 +77,7 @@ func (ms *MasterServer) Assign(ctx context.Context, req *master_pb.AssignRequest if !ms.Topo.HasWritableVolume(option) { if ms.Topo.AvailableSpaceFor(option) <= 0 { - return nil, fmt.Errorf("No free volumes left!") + return nil, fmt.Errorf("no free volumes left for "+option.String()) } ms.vgLock.Lock() if !ms.Topo.HasWritableVolume(option) { diff --git a/weed/server/master_server_handlers.go b/weed/server/master_server_handlers.go index 117423ec6..a9fecc5bd 100644 --- a/weed/server/master_server_handlers.go +++ b/weed/server/master_server_handlers.go @@ -113,7 +113,7 @@ func (ms *MasterServer) dirAssignHandler(w http.ResponseWriter, r *http.Request) if !ms.Topo.HasWritableVolume(option) { if ms.Topo.AvailableSpaceFor(option) <= 0 { - writeJsonQuiet(w, r, http.StatusNotFound, operation.AssignResult{Error: "No free volumes left!"}) + writeJsonQuiet(w, r, http.StatusNotFound, operation.AssignResult{Error: "No free volumes left for " + option.String()}) return } ms.vgLock.Lock() diff --git a/weed/server/webdav_server.go b/weed/server/webdav_server.go index 4b57c7afe..c3f68fdee 100644 --- a/weed/server/webdav_server.go +++ b/weed/server/webdav_server.go @@ -33,6 +33,7 @@ type WebDavOption struct { BucketsPath string GrpcDialOption grpc.DialOption Collection string + Replication string DiskType string Uid uint32 Gid uint32 @@ -225,7 +226,7 @@ func (fs *WebDavFileSystem) OpenFile(ctx context.Context, fullFilePath string, f Uid: fs.option.Uid, Gid: fs.option.Gid, Collection: fs.option.Collection, - Replication: "000", + Replication: fs.option.Replication, TtlSec: 0, }, }, @@ -381,7 +382,7 @@ func (f *WebDavFile) saveDataAsChunk(reader io.Reader, name string, offset int64 request := &filer_pb.AssignVolumeRequest{ Count: 1, - Replication: "", + Replication: f.fs.option.Replication, Collection: f.fs.option.Collection, DiskType: f.fs.option.DiskType, Path: name, |