gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

update

Browse source
This commit is contained in:
tnextday 2015-12-03 21:35:33 +08:00
parent 4fda5f8bfd
commit 82e6d67ccc
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
go/operation/chunked_file.go
View file

@ -87,7 +87,7 @@ func (cm *ChunkManifest) DeleteChunks(master string) error {
// return nil // return nil
//} //}
func httpRangeDownload(fileUrl string, w io.Writer, offset int64) (written int64, e error) { func readChunkNeedle(fileUrl string, w io.Writer, offset int64) (written int64, e error) {
req, err := http.NewRequest("GET", fileUrl, nil) req, err := http.NewRequest("GET", fileUrl, nil)
if err != nil { if err != nil {
return written, err return written, err
@ -112,7 +112,7 @@ func httpRangeDownload(fileUrl string, w io.Writer, offset int64) (written int64
case http.StatusPartialContent: case http.StatusPartialContent:
break break
default: default:
return written, fmt.Errorf("Read Needle http error: [%d] %s", resp.StatusCode, fileUrl) return written, fmt.Errorf("Read chunk needle error: [%d] %s", resp.StatusCode, fileUrl)
} }
return io.Copy(w, resp.Body) return io.Copy(w, resp.Body)
@ -158,7 +158,7 @@ func (cf *ChunkedFileReader) WriteTo(w io.Writer) (n int64, err error) {
if lookupError != nil { if lookupError != nil {
return n, lookupError return n, lookupError
} }
if wn, e := httpRangeDownload(fileUrl, w, chunkStartOffset); e != nil { if wn, e := readChunkNeedle(fileUrl, w, chunkStartOffset); e != nil {
return n, e return n, e
} else { } else {
n += wn n += wn

1
go/weed/weed_server/volume_server_handlers_write.go
View file

@ -75,6 +75,7 @@ func (vs *VolumeServer) DeleteHandler(w http.ResponseWriter, r *http.Request) {
writeJsonError(w, r, http.StatusInternalServerError, errors.New("Load chunks manifest error: "+e.Error())) writeJsonError(w, r, http.StatusInternalServerError, errors.New("Load chunks manifest error: "+e.Error()))
return return
} }
// make sure all chunks had deleted before delete manifest
if e := chunkManifest.DeleteChunks(vs.GetMasterNode()); e != nil { if e := chunkManifest.DeleteChunks(vs.GetMasterNode()); e != nil {
writeJsonError(w, r, http.StatusInternalServerError, errors.New("Delete chunks error: "+e.Error())) writeJsonError(w, r, http.StatusInternalServerError, errors.New("Delete chunks error: "+e.Error()))
return return