diff options
Diffstat (limited to 'go/operation')
| -rw-r--r-- | go/operation/chunked_file.go | 14 | ||||
| -rw-r--r-- | go/operation/delete_content.go | 16 |
2 files changed, 15 insertions, 15 deletions
diff --git a/go/operation/chunked_file.go b/go/operation/chunked_file.go index 33cb25703..dbc450fd8 100644 --- a/go/operation/chunked_file.go +++ b/go/operation/chunked_file.go @@ -70,19 +70,11 @@ func (cm *ChunkManifest) GetData() ([]byte, error) { } func (cm *ChunkManifest) DeleteChunks(master string) error { - fileIds := make([]string, 0, len(cm.Chunks)) - for _, ci := range cm.Chunks { - fileIds = append(fileIds, ci.Fid) - } - results, e := DeleteFiles(master, fileIds) - if e != nil { - return e - } deleteError := 0 - for _, ret := range results.Results { - if ret.Error != "" { + for _, ci := range cm.Chunks { + if e := DeleteFile(master, ci.Fid, ""); e != nil { deleteError++ - glog.V(0).Infoln("delete error:", ret.Error, ret.Fid) + glog.V(0).Infoln("delete error:", e, ci.Fid) } } if deleteError > 0 { 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) { |