diff options
| author | joeslay <54322500+joeslay@users.noreply.github.com> | 2019-10-01 17:55:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-01 17:55:31 +0100 |
| commit | 9d03aa6a38ad964b02cc19dffec60c646567c99f (patch) | |
| tree | dcd9a5eb7fb377deac380aa27d45baa2c3b99963 /weed/server | |
| parent | eb27c2b03762b2ff214824fad504aa348f397afd (diff) | |
| parent | 8599442ab11eb7dcc8cc681b1600d0a1cffc0c6d (diff) | |
| download | seaweedfs-9d03aa6a38ad964b02cc19dffec60c646567c99f.tar.xz seaweedfs-9d03aa6a38ad964b02cc19dffec60c646567c99f.zip | |
Merge pull request #8 from chrislusf/master
merge seaweed master
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/filer_server_handlers_write.go | 2 | ||||
| -rw-r--r-- | weed/server/master_server_handlers.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/weed/server/filer_server_handlers_write.go b/weed/server/filer_server_handlers_write.go index b419c51af..5d95a5d7e 100644 --- a/weed/server/filer_server_handlers_write.go +++ b/weed/server/filer_server_handlers_write.go @@ -275,7 +275,7 @@ func (fs *FilerServer) DeleteHandler(w http.ResponseWriter, r *http.Request) { isRecursive := r.FormValue("recursive") == "true" ignoreRecursiveError := r.FormValue("ignoreRecursiveError") == "true" - err := fs.filer.DeleteEntryMetaAndData(context.Background(), filer2.FullPath(r.URL.Path), isRecursive, ignoreRecursiveError,true) + err := fs.filer.DeleteEntryMetaAndData(context.Background(), filer2.FullPath(r.URL.Path), isRecursive, ignoreRecursiveError, true) if err != nil { glog.V(1).Infoln("deleting", r.URL.Path, ":", err.Error()) writeJsonError(w, r, http.StatusInternalServerError, err) diff --git a/weed/server/master_server_handlers.go b/weed/server/master_server_handlers.go index 93f983375..728c32076 100644 --- a/weed/server/master_server_handlers.go +++ b/weed/server/master_server_handlers.go @@ -48,7 +48,7 @@ func (ms *MasterServer) dirLookupHandler(w http.ResponseWriter, r *http.Request) collection := r.FormValue("collection") //optional, but can be faster if too many collections location := ms.findVolumeLocation(collection, vid) httpStatus := http.StatusOK - if location.Error != "" { + if location.Error != "" || location.Locations == nil { httpStatus = http.StatusNotFound } else { forRead := r.FormValue("read") @@ -60,7 +60,7 @@ func (ms *MasterServer) dirLookupHandler(w http.ResponseWriter, r *http.Request) // findVolumeLocation finds the volume location from master topo if it is leader, // or from master client if not leader -func (ms *MasterServer) findVolumeLocation(collection string, vid string) operation.LookupResult { +func (ms *MasterServer) findVolumeLocation(collection, vid string) operation.LookupResult { var locations []operation.Location var err error if ms.Topo.IsLeader() { |