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

clean up unused options

Browse source 
cleaning error handling
This commit is contained in:
Chris Lu 2012-09-26 14:57:21 -07:00
parent 20706d8cf2
commit 46d13f6b5e
2 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
weed-fs/src/cmd/weed/master.go
View file

@ -29,7 +29,6 @@ var cmdMaster = &Command{
var ( var (
mport = cmdMaster.Flag.Int("port", 9333, "http listen port") mport = cmdMaster.Flag.Int("port", 9333, "http listen port")
metaFolder = cmdMaster.Flag.String("mdir", "/tmp", "data directory to store mappings") metaFolder = cmdMaster.Flag.String("mdir", "/tmp", "data directory to store mappings")
capacity = cmdMaster.Flag.Int("capacity", 100, "maximum number of volumes to hold")
volumeSizeLimitMB = cmdMaster.Flag.Uint("volumeSizeLimitMB", 32*1024, "Default Volume Size in MegaBytes") volumeSizeLimitMB = cmdMaster.Flag.Uint("volumeSizeLimitMB", 32*1024, "Default Volume Size in MegaBytes")
mpulse = cmdMaster.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats") mpulse = cmdMaster.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats")
confFile = cmdMaster.Flag.String("conf", "/etc/weedfs/weedfs.conf", "xml configuration file") confFile = cmdMaster.Flag.String("conf", "/etc/weedfs/weedfs.conf", "xml configuration file")

25
weed-fs/src/cmd/weed/volume.go
View file

@ -136,26 +136,26 @@ func PostHandler(w http.ResponseWriter, r *http.Request) {
errorStatus := "" errorStatus := ""
if ret > 0 || !store.HasVolume(volumeId) { //send to other replica locations if ret > 0 || !store.HasVolume(volumeId) { //send to other replica locations
if r.FormValue("type") != "standard" { if r.FormValue("type") != "standard" {
if distributedOperation(volumeId, func(location operation.Location) bool { if !distributedOperation(volumeId, func(location operation.Location) bool {
_, err := operation.Upload("http://"+location.Url+r.URL.Path+"?type=standard", filename, bytes.NewReader(needle.Data)) _, err := operation.Upload("http://"+location.Url+r.URL.Path+"?type=standard", filename, bytes.NewReader(needle.Data))
return err == nil return err == nil
}) { }) {
w.WriteHeader(http.StatusCreated)
} else {
ret = 0 ret = 0
errorStatus = "Failed to write to replicas for volume " + volumeId.String() errorStatus = "Failed to write to replicas for volume " + volumeId.String()
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
} }
} else {
w.WriteHeader(http.StatusCreated)
} }
} else { } else {
errorStatus = "Failed to write to local disk" errorStatus = "Failed to write to local disk"
w.WriteHeader(http.StatusInternalServerError)
} }
m := make(map[string]interface{}) m := make(map[string]interface{})
m["size"] = ret if errorStatus == "" {
w.WriteHeader(http.StatusCreated)
} else {
w.WriteHeader(http.StatusInternalServerError)
m["error"] = errorStatus m["error"] = errorStatus
}
m["size"] = ret
writeJson(w, r, m) writeJson(w, r, m)
} }
} }
@ -190,17 +190,16 @@ func DeleteHandler(w http.ResponseWriter, r *http.Request) {
if ret > 0 || !store.HasVolume(volumeId) { //send to other replica locations if ret > 0 || !store.HasVolume(volumeId) { //send to other replica locations
if r.FormValue("type") != "standard" { if r.FormValue("type") != "standard" {
if distributedOperation(volumeId, func(location operation.Location) bool { if !distributedOperation(volumeId, func(location operation.Location) bool {
return nil == operation.Delete("http://"+location.Url+r.URL.Path+"?type=standard") return nil == operation.Delete("http://"+location.Url+r.URL.Path+"?type=standard")
}) { }) {
w.WriteHeader(http.StatusCreated)
} else {
ret = 0 ret = 0
w.WriteHeader(http.StatusInternalServerError)
} }
} else {
w.WriteHeader(http.StatusCreated)
} }
}
if ret != 0 {
w.WriteHeader(http.StatusAccepted)
} else { } else {
w.WriteHeader(http.StatusInternalServerError) w.WriteHeader(http.StatusInternalServerError)
} }