diff options
| author | tnextday <fw2k4@163.com> | 2015-12-03 16:27:02 +0800 |
|---|---|---|
| committer | tnextday <fw2k4@163.com> | 2015-12-03 16:27:02 +0800 |
| commit | daac5de1bae20de28082367db44b7b7afa9e4aaf (patch) | |
| tree | 77b9ca3beb5f33f736b5a66da8ecf4a53ed1e576 /go/operation/delete_content.go | |
| parent | a9a336fdff076211e7c94a4243b430219e5d891c (diff) | |
| download | seaweedfs-daac5de1bae20de28082367db44b7b7afa9e4aaf.tar.xz seaweedfs-daac5de1bae20de28082367db44b7b7afa9e4aaf.zip | |
more check in `http_util.Delete`
add status code in `DeleteResult` struct
operation.DeleteFiles maybe unsafe, so `ChunkManifest.DeleteChunks` manually delete each chunks
Diffstat (limited to 'go/operation/delete_content.go')
| -rw-r--r-- | go/operation/delete_content.go | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/go/operation/delete_content.go b/go/operation/delete_content.go index ac3dfa6b2..32ad69b17 100644 --- a/go/operation/delete_content.go +++ b/go/operation/delete_content.go @@ -7,14 +7,17 @@ import ( "strings" "sync" + "net/http" + "github.com/chrislusf/seaweedfs/go/security" "github.com/chrislusf/seaweedfs/go/util" ) type DeleteResult struct { - Fid string `json:"fid"` - Size int `json:"size"` - Error string `json:"error,omitempty"` + Fid string `json:"fid"` + Size int `json:"size"` + Status int `json:"status"` + Error string `json:"error,omitempty"` } func DeleteFile(master string, fileId string, jwt security.EncodedJwt) error { @@ -45,7 +48,11 @@ func DeleteFiles(master string, fileIds []string) (*DeleteFilesResult, error) { for _, fileId := range fileIds { vid, _, err := ParseFileId(fileId) if err != nil { - ret.Results = append(ret.Results, DeleteResult{Fid: vid, Error: err.Error()}) + ret.Results = append(ret.Results, DeleteResult{ + Fid: vid, + Status: http.StatusBadRequest, + Error: err.Error()}, + ) continue } if _, ok := vid_to_fileIds[vid]; !ok { @@ -76,6 +83,7 @@ func DeleteFiles(master string, fileIds []string) (*DeleteFilesResult, error) { } var wg sync.WaitGroup + for server, fidList := range server_to_fileIds { wg.Add(1) go func(server string, fidList []string) { |
