|
@ -217,11 +217,7 @@ func (fs *FilerServer) DeleteHandler(w http.ResponseWriter, r *http.Request) { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
err := fs.filer.DeleteEntryMetaAndData(context.Background(), util.FullPath(objectPath), isRecursive, ignoreRecursiveError, !skipChunkDeletion, false, nil, 0) |
|
|
err := fs.filer.DeleteEntryMetaAndData(context.Background(), util.FullPath(objectPath), isRecursive, ignoreRecursiveError, !skipChunkDeletion, false, nil, 0) |
|
|
if err != nil { |
|
|
|
|
|
if err == filer_pb.ErrNotFound { |
|
|
|
|
|
writeJsonQuiet(w, r, http.StatusNoContent, nil) |
|
|
|
|
|
return |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if err != nil && err != filer_pb.ErrNotFound { |
|
|
glog.V(1).Infoln("deleting", objectPath, ":", err.Error()) |
|
|
glog.V(1).Infoln("deleting", objectPath, ":", err.Error()) |
|
|
writeJsonError(w, r, http.StatusInternalServerError, err) |
|
|
writeJsonError(w, r, http.StatusInternalServerError, err) |
|
|
return |
|
|
return |
|
|