diff options
| author | chrislu <chris.lu@gmail.com> | 2022-08-21 17:02:16 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-08-21 17:02:16 -0700 |
| commit | fef9c6a520092fce8ea0ab9acfadf7bca882b5fe (patch) | |
| tree | d8a2704d476df2a8c01c8e637de77117d1116b6c | |
| parent | 27621541302390d240b4d2ae60e92574abb696a5 (diff) | |
| download | seaweedfs-fef9c6a520092fce8ea0ab9acfadf7bca882b5fe.tar.xz seaweedfs-fef9c6a520092fce8ea0ab9acfadf7bca882b5fe.zip | |
filer: do not always save files in "/etc" folder to filer store
fix https://github.com/seaweedfs/seaweedfs/issues/3476
| -rw-r--r-- | weed/filer/filer_conf.go | 2 | ||||
| -rw-r--r-- | weed/server/filer_server_handlers_write_upload.go | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/weed/filer/filer_conf.go b/weed/filer/filer_conf.go index 30161cfaf..851f8264b 100644 --- a/weed/filer/filer_conf.go +++ b/weed/filer/filer_conf.go @@ -17,7 +17,7 @@ import ( ) const ( - DirectoryEtcRoot = "/etc" + DirectoryEtcRoot = "/etc/" DirectoryEtcSeaweedFS = "/etc/seaweedfs" DirectoryEtcRemote = "/etc/remote" FilerConfName = "filer.conf" diff --git a/weed/server/filer_server_handlers_write_upload.go b/weed/server/filer_server_handlers_write_upload.go index b53ad169a..c4565b08b 100644 --- a/weed/server/filer_server_handlers_write_upload.go +++ b/weed/server/filer_server_handlers_write_upload.go @@ -9,12 +9,10 @@ import ( "io" "net/http" "strconv" - "strings" "sync" "sync/atomic" "time" - "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/operation" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" @@ -83,7 +81,7 @@ func (fs *FilerServer) uploadReaderToChunks(w http.ResponseWriter, r *http.Reque break } if chunkOffset == 0 && !isAppend { - if dataSize < fs.option.SaveToFilerLimit || strings.HasPrefix(r.URL.Path, filer.DirectoryEtcRoot) { + if dataSize < fs.option.SaveToFilerLimit { chunkOffset += dataSize smallContent = make([]byte, dataSize) bytesBuffer.Read(smallContent) |