gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better error reporting and handling

Browse Source
This commit is contained in:
Chris Lu
2012-09-26 13:38:45 -07:00
parent 3d53f73006
commit a847e2beee
4 changed files with 54 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
weed-fs/src/cmd/weed/upload.go
View File

@@ -44,7 +44,7 @@ func assign(count int) (*AssignResult, error) {
values.Add("replication", *uploadReplication)
jsonBlob, err := util.Post("http://"+*server+"/dir/assign", values)
if *IsDebug {
fmt.Println("debug", *IsDebug, "assign result :", string(jsonBlob))
fmt.Println("assign result :", string(jsonBlob))
}
if err != nil {
return nil, err
@@ -83,7 +83,8 @@ type SubmitResult struct {
func submit(files []string) []SubmitResult {
ret, err := assign(len(files))
if err != nil {
panic(err)
fmt.Println(err)
return nil
}
results := make([]SubmitResult, len(files))
for index, file := range files {

68
weed-fs/src/cmd/weed/volume.go
View File

@@ -135,13 +135,20 @@ func PostHandler(w http.ResponseWriter, r *http.Request) {
ret := store.Write(volumeId, needle)
if ret > 0 || !store.HasVolume(volumeId) { //send to other replica locations
if r.FormValue("type") != "standard" {
waitTime, err := strconv.Atoi(r.FormValue("wait"))
distributedOperation(volumeId, func(location operation.Location) bool {
operation.Upload("http://"+location.Url+r.URL.Path+"?type=standard", filename, bytes.NewReader(needle.Data))
return true
}, err == nil && waitTime > 0)
if distributedOperation(volumeId, func(location operation.Location) bool {
_, err := operation.Upload("http://"+location.Url+r.URL.Path+"?type=standard", filename, bytes.NewReader(needle.Data))
return err == nil
}) {
w.WriteHeader(http.StatusCreated)
} else {
ret = 0
w.WriteHeader(http.StatusInternalServerError)
}
} else {
w.WriteHeader(http.StatusCreated)
}
w.WriteHeader(http.StatusCreated)
} else {
w.WriteHeader(http.StatusInternalServerError)
}
m := make(map[string]uint32)
m["size"] = ret
@@ -179,13 +186,19 @@ func DeleteHandler(w http.ResponseWriter, r *http.Request) {
if ret > 0 || !store.HasVolume(volumeId) { //send to other replica locations
if r.FormValue("type") != "standard" {
waitTime, err := strconv.Atoi(r.FormValue("wait"))
distributedOperation(volumeId, func(location operation.Location) bool {
operation.Delete("http://"+location.Url+r.URL.Path+"?type=standard")
return true
}, err == nil && waitTime > 0)
if distributedOperation(volumeId, func(location operation.Location) bool {
return nil == operation.Delete("http://"+location.Url+r.URL.Path+"?type=standard")
}) {
w.WriteHeader(http.StatusCreated)
} else {
ret = 0
w.WriteHeader(http.StatusInternalServerError)
}
} else {
w.WriteHeader(http.StatusCreated)
}
w.WriteHeader(http.StatusCreated)
} else {
w.WriteHeader(http.StatusInternalServerError)
}
m := make(map[string]uint32)
@@ -215,23 +228,32 @@ func parseURLPath(path string) (vid, fid, ext string) {
type distributedFunction func(location operation.Location) bool
func distributedOperation(volumeId storage.VolumeId, op distributedFunction, wait bool) {
func distributedOperation(volumeId storage.VolumeId, op distributedFunction) bool {
if lookupResult, lookupErr := operation.Lookup(*masterNode, volumeId); lookupErr == nil {
sendFunc := func(background bool) {
for _, location := range lookupResult.Locations {
if location.Url != (*ip + ":" + strconv.Itoa(*vport)) {
if background {
go op(location)
} else {
op(location)
}
}
length := 0
sem := make(chan int, len(lookupResult.Locations))
selfUrl := (*ip + ":" + strconv.Itoa(*vport))
results := make(chan bool)
for _, location := range lookupResult.Locations {
if location.Url != selfUrl {
sem <- 1
length++
go func(op distributedFunction, location operation.Location, sem chan int, results chan bool) {
ret := op(location)
<-sem
results <- ret
}(op, location, sem, results)
}
}
sendFunc(wait)
ret := true
for i := 0; i < length; i++ {
ret = ret && <-results
}
return ret
} else {
log.Println("Failed to lookup for", volumeId, lookupErr.Error())
}
return false
}
func runVolume(cmd *Command, args []string) bool {