aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2021-03-24 01:03:11 -0700
committerChris Lu <chris.lu@gmail.com>2021-03-24 01:03:11 -0700
commita801332b0dc44ea3239e437b845e210c840e125e (patch)
treeeb60ed5fa65e08085f8801b7405fa9bf7567d626
parentc42b95c596f762dcca2bc9c7e7a918ab8ca8b206 (diff)
downloadseaweedfs-a801332b0dc44ea3239e437b845e210c840e125e.tar.xz
seaweedfs-a801332b0dc44ea3239e437b845e210c840e125e.zip
filer: return 409 if file conflicts with a directory
fix https://github.com/chrislusf/seaweedfs/issues/1938
-rw-r--r--weed/server/filer_server_handlers_write_autochunk.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/weed/server/filer_server_handlers_write_autochunk.go b/weed/server/filer_server_handlers_write_autochunk.go
index b990f6488..b44dc381a 100644
--- a/weed/server/filer_server_handlers_write_autochunk.go
+++ b/weed/server/filer_server_handlers_write_autochunk.go
@@ -59,6 +59,8 @@ func (fs *FilerServer) autoChunk(ctx context.Context, w http.ResponseWriter, r *
if err != nil {
if strings.HasPrefix(err.Error(), "read input:") {
writeJsonError(w, r, 499, err)
+ }else if strings.HasSuffix(err.Error(), "is a file") {
+ writeJsonError(w, r, http.StatusConflict, err)
} else {
writeJsonError(w, r, http.StatusInternalServerError, err)
}